trusty-cms 7.0.48 → 7.1.0

data/lib/trusty_cms/geometry.rb

@@ -0,0 +1,117 @@
+module TrustyCms
+  class StyleError < StandardError; end
+  class TransformationError < StandardError; end
+
+  class Geometry
+    attr_reader :width, :height, :modifier
+
+    def self.parse(value)
+      return value if value.is_a?(Geometry)
+
+      match = value.to_s.strip.match(/\A(\d*)x(\d*)([%<>#^!@])?\z/)
+      raise StyleError, "Unrecognized geometry: #{value.inspect}" unless match
+
+      width = match[1].to_s.empty? ? 0 : match[1].to_i
+      height = match[2].to_s.empty? ? 0 : match[2].to_i
+      modifier = match[3]
+      new(width, height, modifier)
+    end
+
+    def initialize(width, height = nil, modifier = nil)
+      @width = width.to_i
+      @height = height.to_i
+      @modifier = modifier
+    end
+
+    def without_modifier
+      Geometry.new(width, height)
+    end
+
+    def transformed_by(other)
+      other = Geometry.parse(other)
+      return other.without_modifier if self =~ other || ['#', '!', '^'].include?(other.modifier)
+
+      raise TransformationError, 'geometry is not transformable without both width and height' if height.zero? || width.zero?
+
+      case other.modifier
+      when '>'
+        (other.width < width || other.height < height) ? scaled_to_fit(other) : self
+      when '<'
+        (other.width > width && other.height > height) ? scaled_to_fit(other) : self
+      when '%'
+        scaled_by(other)
+      when '@'
+        scaled_by((other.width * 100).fdiv(width * height))
+      else
+        scaled_to_fit(other)
+      end
+    end
+    alias * transformed_by
+
+    def ==(other)
+      to_s == other.to_s
+    end
+
+    def =~(other)
+      height.to_i == other.height.to_i && width.to_i == other.width.to_i
+    end
+
+    def scaled_to_fit(other)
+      if other.width.positive? && other.height.zero?
+        Geometry.new(other.width, height * other.width / width)
+      elsif other.width.zero? && other.height.positive?
+        Geometry.new(width * other.height / height, other.height)
+      else
+        product_width = other.width * height
+        product_height = other.height * width
+        if product_width == product_height
+          other.without_modifier
+        elsif product_width > product_height
+          scaled_width = (width * other.height.fdiv(height)).round
+          Geometry.new(scaled_width, other.height)
+        else
+          scaled_height = (height * other.width.fdiv(width)).round
+          Geometry.new(other.width, scaled_height)
+        end
+      end
+    end
+
+    def scaled_by(other)
+      if other.is_a?(Numeric)
+        scaled_width = (width * other.fdiv(100)).round
+        scaled_height = (height * other.fdiv(100)).round
+        return Geometry.new(scaled_width, scaled_height)
+      end
+
+      other = Geometry.new("#{other}%") unless other.is_a?(Geometry)
+      if other.height.positive?
+        Geometry.new(width * other.width / 100, height * other.height / 100)
+      else
+        Geometry.new(width * other.width / 100, height * other.width / 100)
+      end
+    end
+
+    def aspect
+      return nil if width.to_f == 0.0 || height.to_f == 0.0
+
+      width.to_f / height.to_f
+    end
+
+    def square?
+      width.to_i == height.to_i
+    end
+
+    def vertical?
+      height.to_i > width.to_i
+    end
+
+    def horizontal?
+      width.to_i > height.to_i
+    end
+
+    def to_s
+      suffix = modifier.to_s
+      "#{width}x#{height}#{suffix}"
+    end
+  end
+end

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.48'.freeze
+  VERSION = '7.1.0'.freeze
 end

data/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
     "blueimp-file-upload": "^10.32.0",
-    "ckeditor5": "46.0.3",
+    "ckeditor5": "47.6.0",
     "jquery": "^3.6.1",
     "jquery-treetable": "^3.2.0-1",
     "jquery-ui": "^1.13.2",

data/spec/lib/trusty_cms/geometry_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+RSpec.describe TrustyCms::Geometry do
+  describe '.parse' do
+    it 'parses basic geometry strings' do
+      geom = described_class.parse('100x200')
+      expect(geom.width).to eq(100)
+      expect(geom.height).to eq(200)
+      expect(geom.modifier).to be_nil
+    end
+
+    it 'parses geometry modifiers' do
+      geom = described_class.parse('640x480@')
+      expect(geom.width).to eq(640)
+      expect(geom.height).to eq(480)
+      expect(geom.modifier).to eq('@')
+    end
+  end
+
+  describe '#transformed_by' do
+    it 'scales to fit preserving aspect ratio' do
+      source = described_class.new(400, 200)
+      result = source.transformed_by('100x100')
+      expect(result.width).to eq(100)
+      expect(result.height).to eq(50)
+    end
+  end
+end

data/spec/models/asset_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 require 'rack/test'
+require 'base64'
+require 'stringio'
 
 RSpec.describe Asset, type: :model do
   let(:fixtures_path) { TrustyCms::Engine.root.join('spec', 'fixtures', 'files') }
@@ -36,4 +38,68 @@ RSpec.describe Asset, type: :model do
       end
     end
   end
+  describe 'active storage metadata' do
+    before do
+      AssetType.new :image, :styles => :standard, :extensions => %w[png], :mime_types => %w[image/png] unless AssetType.known?(:image)
+    end
+
+    let(:png_data) do
+      Base64.decode64('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==')
+    end
+
+    def png_io
+      io = StringIO.new(png_data)
+      io.set_encoding(Encoding::BINARY)
+      io.rewind
+      io
+    end
+
+    it 'exposes filename, content type, and size from the attachment' do
+      asset = described_class.new(caption: '')
+      asset.asset.attach(io: png_io, filename: 'pixel.png', content_type: 'image/png')
+      asset.save!
+
+      expect(asset.filename).to eq('pixel.png')
+      expect(asset.content_type).to eq('image/png')
+      expect(asset.byte_size).to eq(png_data.bytesize)
+      expect(asset.original_extension).to eq('png')
+    end
+
+    it 'reports styles and extensions from active storage styles' do
+      asset = described_class.new(caption: '')
+      asset.asset.attach(io: png_io, filename: 'pixel.png', content_type: 'image/png')
+      asset.save!
+
+      expect(asset.style?('thumbnail')).to be(true)
+      expect(asset.extension('thumbnail').to_s).to eq('png')
+    end
+  end
+
+  describe 'thumbnails' do
+    before do
+      AssetType.new :image, :styles => :standard, :extensions => %w[png], :mime_types => %w[image/png] unless AssetType.known?(:image)
+    end
+
+    let(:png_data) do
+      Base64.decode64('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==')
+    end
+
+    def png_io
+      io = StringIO.new(png_data)
+      io.set_encoding(Encoding::BINARY)
+      io.rewind
+      io
+    end
+
+    it 'returns a variant url for known styles' do
+      asset = described_class.new(caption: '')
+      asset.asset.attach(io: png_io, filename: 'pixel.png', content_type: 'image/png')
+      asset.save!
+
+      variant = instance_double(ActiveStorage::Variant, processed: instance_double(ActiveStorage::Variant, url: '/rails/active_storage/variant/test'))
+      allow(asset).to receive(:asset_variant).with('thumbnail').and_return(variant)
+
+      expect(asset.thumbnail('thumbnail')).to eq('/rails/active_storage/variant/test')
+    end
+  end
 end

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

@@ -9,10 +9,10 @@ class ClippedExtension < TrustyCms::Extension
         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 :image, :icon => 'image', :default_radius_tag => 'image', :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', :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]
-        AssetType.new :pdf, :icon => 'pdf', :processors => [:thumbnail], :extensions => %w{pdf}, :mime_types => %w[application/pdf application/x-pdf], :styles => :standard
+        AssetType.new :pdf, :icon => 'pdf', :extensions => %w{pdf}, :mime_types => %w[application/pdf application/x-pdf], :styles => :standard
         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'
 
@@ -23,10 +23,6 @@ class ClippedExtension < TrustyCms::Extension
         admin.configuration.show.add :trusty_config, 'admin/configuration/clipped_show', :after => '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
-          Paperclip.options[:command_path] = TrustyCms::config["paperclip.command_path"]
-        end
-
         tab "Assets", :after => "Content" do
           add_item "All", "/admin/assets"
         end

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

@@ -181,17 +181,24 @@ module AssetTags
     options = tag.attr.dup
     # XXX build_regexp_for comes from StandardTags
     regexp = build_regexp_for(tag, options)
-    asset_content_type = tag.locals.asset.asset_content_type
+    asset_content_type = tag.locals.asset.content_type
     tag.expand unless asset_content_type.match(regexp).nil?
   end
 
+  attribute_mappings = {
+    asset_file_name: :filename,
+    asset_content_type: :content_type,
+    asset_file_size: :byte_size,
+  }
+
   [: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
     }
     tag "asset:#{method.to_s}" do |tag|
       asset, options = asset_and_options(tag)
-      asset.send(method) rescue nil
+      mapped = attribute_mappings.fetch(method, method)
+      asset.send(mapped) rescue nil
     end
   end
 
@@ -201,7 +208,7 @@ module AssetTags
 
   tag 'asset:filename' do |tag|
     asset, options = asset_and_options(tag)
-    asset.asset_file_name rescue nil
+    asset.filename rescue nil
   end
 
   desc %{
@@ -308,4 +315,3 @@ module AssetTags
     }
   end
 end
-

data/vendor/extensions/clipped-extension/lib/generators/templates/clipped_config.rb

@@ -3,10 +3,6 @@ TrustyCms.config do |config|
   # Uncomment and change the settings below to customize the Clipped extension
 
   # The default settings
-  # config["paperclip.url"] = "/system/:attachment/:id/:style/:basename:no_original_style.:extension"
-  # config["paperclip.path"] = ":rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension"
-  # config["paperclip.storage"] = "filesystem"
-  # config["paperclip.skip_filetype_validation"] = true
   # config["assets.max_asset_size"] = 5 # megabytes
   # config["assets.display_size"] = "normal"
   # config["assets.insertion_size"] = "normal"
@@ -19,35 +15,14 @@ TrustyCms.config do |config|
   # config["assets.thumbnails.video"] = "normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg"
   # config["assets.thumbnails.pdf"] = "normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg"
 
-  # An example of using Amazon S3
-  # add `gem "fog", "~> 1.0"` to your Gemfile and run `bundle install`
-  # config["paperclip.storage"] = "fog"
-  # config["paperclip.path"] = ":attachment/:id/:style/:basename:no_original_style.:extension"
-  # config["paperclip.fog.provider"] = "AWS"
-  # config["paperclip.fog.directory"] = "bucket-name"
-  # config["paperclip.s3.key"] = "S3_KEY"
-  # config["paperclip.s3.secret"] = "S3_SECRET"
-  # optionally use a custom domain name; requires a CNAME DNS record
-  # config["paperclip.fog.host"] = "http://assets.example.com"
-  # optionally set the S3 region of your bucket; defaults to US East
-  # 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
-  # config["paperclip.s3.region"] = "us-east-1"
-
-  # An example of using Rackspace Cloud Files
-  # add `gem "fog", "~> 1.0"` to your Gemfile and run `bundle install`
-  # config["paperclip.storage"] = "fog"
-  # config["paperclip.path"] = ":attachment/:id/:style/:basename:no_original_style.:extension"
-  # config["paperclip.fog.provider"] = "Rackspace"
-  # config["paperclip.fog.directory"] = "container-name"
-  # config["paperclip.rackspace.username"] = "RACKSPACE_USERNAME"
-  # config["paperclip.rackspace.api_key"] = "RACKSPACE_API_KEY"
-  # paperclip.fog.host is your Cloud Files CDN URL
-  # config["paperclip.fog.host"] = "http://a.b.c.rackcdn.com"
-  # optionally use a custom domain name; requires a CNAME DNS record
-  # config["paperclip.fog.host"] = "http://assets.example.com"
+  # ActiveStorage configuration is handled in config/storage.yml and
+  # config.active_storage.service (per environment). For S3 or other
+  # cloud providers, configure the appropriate ActiveStorage service.
+  #
+  # Optional CDN host override for ActiveStorage URLs:
+  # config["assets.cdn.host"] = "https://assets.example.com"
+  #
+  # Or provide a dynamic host in an initializer:
+  # TrustyCmsClippedExtension::Cloud.host_provider = -> { AssetBucket.current&.asset_host }
 
 end

data/vendor/extensions/clipped-extension/lib/tasks/active_storage_tasks.rake

@@ -0,0 +1,66 @@
+def obtain_class
+  class_name = ENV['CLASS'] || ENV['class']
+  raise "Must specify CLASS" unless class_name
+  Object.const_get(class_name)
+end
+
+def obtain_attachments(klass)
+  name = ENV['ATTACHMENT'] || ENV['attachment']
+  attachment_names = if klass.respond_to?(:reflect_on_all_attachments)
+                       klass.reflect_on_all_attachments.map(&:name)
+                     else
+                       []
+                     end
+  raise "Class #{klass.name} has no ActiveStorage attachments" if attachment_names.empty?
+  if name.present? && attachment_names.include?(name.to_sym)
+    [name.to_sym]
+  else
+    attachment_names
+  end
+end
+
+def for_all_attachments
+  klass = obtain_class
+  names = obtain_attachments(klass)
+
+  klass.find_each do |instance|
+    names.each do |name|
+      attachment = instance.public_send(name)
+      result = if attachment.attached?
+                 yield(instance, name, attachment)
+               else
+                 true
+               end
+      print result ? "." : "x"; $stdout.flush
+    end
+  end
+  puts " Done."
+end
+
+namespace :active_storage do
+  desc "Refreshes both metadata and variants."
+  task :refresh => ["active_storage:refresh:metadata", "active_storage:refresh:variants"]
+
+  namespace :refresh do
+    desc "Regenerates variants for a given CLASS (and optional ATTACHMENT)."
+    task :variants => :environment do
+      for_all_attachments do |instance, name, attachment|
+        if instance.respond_to?(:refresh_variants!) && name == :asset
+          instance.refresh_variants!
+        else
+          attachment.preview if attachment.previewable?
+        end
+        true
+      end
+    end
+
+    desc "Re-analyzes metadata for a given CLASS (and optional ATTACHMENT)."
+    task :metadata => :environment do
+      for_all_attachments do |instance, name, attachment|
+        attachment.analyze unless attachment.analyzed?
+        instance.save(validate: false)
+        true
+      end
+    end
+  end
+end

data/vendor/extensions/clipped-extension/lib/tasks/clipped_extension_tasks.rake

@@ -52,8 +52,11 @@ namespace :trusty do
         asset_path = File.join(Rails.root, "assets")
         mkdir_p asset_path
         Asset.find(:all).each do |asset|
-          puts "Exporting #{asset.asset_file_name}"
-          cp asset.asset.path, File.join(asset_path, asset.asset_file_name)
+          next unless asset.asset.attached?
+          puts "Exporting #{asset.filename}"
+          asset.asset.open do |file|
+            cp file.path, File.join(asset_path, asset.filename)
+          end
         end
         puts "Done."
       end

data/vendor/extensions/clipped-extension/lib/trusty_cms_clipped_extension/cloud.rb

@@ -1,41 +1,46 @@
+require 'uri'
+
 module TrustyCmsClippedExtension
 
   module Cloud
+    mattr_accessor :host_provider
 
     def self.credentials
-      case TrustyCms.config["paperclip.fog.provider"]
-      when "AWS"
-        {
-          :provider => "AWS",
-          :aws_access_key_id => TrustyCms.config["paperclip.s3.key"],
-          :aws_secret_access_key => TrustyCms.config["paperclip.s3.secret"],
-          :region => TrustyCms.config["paperclip.s3.region"],
-        }
-      when "Google"
-        {
-          :provider => "Google",
-          :rackspace_username => TrustyCms.config["paperclip.google_storage.access_key_id"],
-          :rackspace_api_key  => TrustyCms.config["paperclip.google_storage.secret_access_key"]
-        }
-      when "Rackspace"
-        {
-          :provider => "Rackspace",
-          :rackspace_username => TrustyCms.config["paperclip.rackspace.username"],
-          :rackspace_api_key  => TrustyCms.config["paperclip.rackspace.api_key"]
-        }
-      end
+      service = ActiveStorage::Blob.service
+      return {} unless service.respond_to?(:config)
+
+      service.config
     end
 
     def self.host
-      return TrustyCms.config["paperclip.fog.host"] if TrustyCms.config["paperclip.fog.host"]
-      case TrustyCms.config["paperclip.fog.provider"]
-      when "AWS"
-        "http://#{TrustyCms.config['paperclip.fog.directory']}.s3.amazonaws.com"
-      else
-        nil
+      if host_provider
+        host_provider.call
+      elsif defined?(TrustyCms::Config)
+        TrustyCms::Config['assets.cdn.host']
       end
     end
 
+    def self.rewrite_url(url)
+      return url unless url.present?
+      configured_host = host
+      return url if configured_host.blank?
+
+      uri = URI.parse(url)
+      return url unless uri.is_a?(URI::HTTP)
+
+      host_uri = URI.parse(configured_host.to_s.match?(/\Ahttps?:\/\//) ? configured_host.to_s : "https://#{configured_host}")
+      uri.scheme = host_uri.scheme if host_uri.scheme
+      uri.host = host_uri.host if host_uri.host
+      uri.port = host_uri.port if host_uri.port
+
+      if host_uri.path.present? && host_uri.path != '/'
+        uri.path = File.join(host_uri.path, uri.path.sub(%r{\A/}, ''))
+      end
+
+      uri.to_s
+    rescue URI::InvalidURIError
+      url
+    end
   end
 
 end