trusty-cms 7.0.48 → 7.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.48
+  version: 7.1.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-27 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -1134,12 +1134,12 @@ files:
 - lib/trusty_cms/admin_ui/region_set.rb
 - lib/trusty_cms/available_locales.rb
 - lib/trusty_cms/config/definition.rb
-- lib/trusty_cms/deprecation.rb
 - lib/trusty_cms/engine.rb
 - lib/trusty_cms/extension.rb
 - lib/trusty_cms/extension_loader.rb
 - lib/trusty_cms/extension_migrator.rb
 - lib/trusty_cms/extension_path.rb
+- lib/trusty_cms/geometry.rb
 - lib/trusty_cms/initializer.rb
 - lib/trusty_cms/pagination/controller.rb
 - lib/trusty_cms/pagination/link_renderer.rb
@@ -1211,6 +1211,7 @@ files:
 - spec/fixtures/files/sample.ics
 - spec/fixtures/files/sample.txt
 - spec/fixtures/users.yml
+- spec/lib/trusty_cms/geometry_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/layout_spec.rb
 - spec/models/snippets_spec.rb
@@ -1226,10 +1227,8 @@ files:
 - vendor/extensions/clipped-extension/lib/clipped_admin_ui.rb
 - vendor/extensions/clipped-extension/lib/generators/templates/clipped_config.rb
 - vendor/extensions/clipped-extension/lib/page_asset_associations.rb
-- vendor/extensions/clipped-extension/lib/paperclip/frame_grab.rb
-- vendor/extensions/clipped-extension/lib/paperclip/geometry_transformation.rb
+- vendor/extensions/clipped-extension/lib/tasks/active_storage_tasks.rake
 - vendor/extensions/clipped-extension/lib/tasks/clipped_extension_tasks.rake
-- vendor/extensions/clipped-extension/lib/tasks/paperclip_tasks.rake
 - vendor/extensions/clipped-extension/lib/trusty_cms_clipped_extension.rb
 - vendor/extensions/clipped-extension/lib/trusty_cms_clipped_extension/cloud.rb
 - vendor/extensions/layouts-extension/layouts_extension.rb
@@ -1369,6 +1368,7 @@ test_files:
 - spec/fixtures/files/sample.ics
 - spec/fixtures/files/sample.txt
 - spec/fixtures/users.yml
+- spec/lib/trusty_cms/geometry_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/layout_spec.rb
 - spec/models/snippets_spec.rb

data/lib/trusty_cms/deprecation.rb

@@ -1,15 +0,0 @@
-require 'active_support'
-
-class AssetType
-  def paperclip_processors
-    deprecation = ActiveSupport::Deprecation.new
-    deprecation.warn('Paperclip processors will be deprecated soon in favor of ActiveStorage.')
-
-    active_storage_styles
-  end
-
-  def paperclip_styles
-    deprecation = ActiveSupport::Deprecation.new
-    deprecation.warn('Paperclip styles will be deprecated soon in favor of ActiveStorage.')
-  end
-end

data/vendor/extensions/clipped-extension/lib/paperclip/frame_grab.rb

@@ -1,73 +0,0 @@
-module Paperclip
-  class FrameGrab < Processor
-
-    attr_accessor :time_offset, :current_geometry, :target_geometry, :whiny, :current_format, :target_format
-
-    def initialize(file, options = {}, attachment = nil)
-      super
-      @file = file
-      @time_offset = options[:time_offset] || '-4'
-      geometry = options[:geometry]
-      unless geometry.blank?
-        @crop = geometry[-1,1] == '#'
-        @target_geometry = Geometry.parse(geometry)
-        @current_geometry = Geometry.parse(video_dimensions(file))
-      end
-      @current_format = File.extname(@file.path)
-      @target_format = options[:format] || 'jpg'
-      @basename = File.basename(@file.path, @current_format)
-      @whiny = options[:whiny].nil? ? true : options[:whiny]
-    end
-
-    def crop?
-      !!@crop
-    end
-    
-    def make
-      src = @file
-      dst = Tempfile.new([ @basename, @target_format ].compact.join("."))
-      dst.binmode
-
-      begin
-        # grab frame at offset
-        cmd = %Q[-itsoffset #{time_offset} -i :source -y -vcodec mjpeg -vframes 1 -an -f rawvideo ]
-
-        # if scale-and-crop parameters can be calculated, we pipe to convert for resizing
-        if scale_and_crop = transformation_options
-          cmd << %{pipe: | convert #{scale_and_crop} - #{target_format}:- }
-
-        # otherwise we let ffmpeg resize the to the right size without preserving aspect ratio
-        else
-          cmd << %{-s #{target_geometry} pipe: }
-        end
-
-        # then pipe to composite to overlay video icon
-        cmd << %{| composite -gravity center :icon - :dest }
-        
-        Paperclip.run('ffmpeg', cmd, :source => File.expand_path(src.path), :dest => File.expand_path(dst.path), :icon => AssetType.find(:video).icon_path, :swallow_stderr => false)
-      rescue PaperclipCommandLineError => e
-        raise PaperclipError, "There was an error processing the thumbnail for #{@basename}: #{e}" if whiny
-      end
-      
-      dst
-    end
-    
-    # get video dimensions in nasty hacky way
-    def video_dimensions(file)
-      dim = Paperclip.run('ffmpeg', '-i :source 2>&1', :source => File.expand_path(file.path), :expected_outcodes => [0,1], :swallow_stderr => false)
-      $1 if dim =~ /(\d+x\d+)/
-    end
-    
-    # Duplicated from Thumbnail. We can't just subclass because of assumed compatibility with Geometry.from_file
-    def transformation_options
-      if current_geometry
-        scale, crop = current_geometry.transformation_to(target_geometry, crop?)
-        trans = []
-        trans << "-resize" << %["#{scale}"] unless scale.nil? || scale.empty?
-        trans << "-crop" << %["#{crop}"] << "+repage" if crop
-        trans.join(" ")
-      end
-    end
-    
-  end
-end

data/vendor/extensions/clipped-extension/lib/paperclip/geometry_transformation.rb

@@ -1,80 +0,0 @@
-module Paperclip
-
-  class TransformationError < PaperclipError; end
-  class StyleError < PaperclipError; end
-  
-  class Geometry
-    
-    # Returns a new Geometry object with the the same dimensions as this but with no modifier.
-    def without_modifier
-      Geometry.new(self.width, self.height)
-    end
-    
-    # Returns the dimensions that would result if a thumbnail was created by transforming this geometry into that geometry.
-    # Its purpose is to mimic imagemagick conversions. Used like so:
-    #    file_geometry.transformed_by(style_geometry)
-    # it returns the size of the thumbnail image you would get by applying that rule.
-    # This saves us having to go back to the file, which is expensive with S3.
-    # We understand all the Imagemagick geometry arguments described at http://www.imagemagick.org/script/command-line-processing.php#geometry
-    # including both '^' and paperclip's own '#' modifier.
-    #
-    def transformed_by (other)
-      other = Geometry.parse(other) unless other.is_a? Geometry
-      # if the two geometries are similar, or the destination geometry is a fixed size, the resulting dimensions are fixed
-      return other.without_modifier if self =~ other || ['#', '!', '^'].include?(other.modifier)
-      # otherwise, we apply the transformation
-      raise TransformationError, "geometry is not transformable without both width and height" if self.height == 0 or self.width == 0
-      case other.modifier
-      when '>'
-        (other.width < self.width || other.height < self.height) ? scaled_to_fit(other) : self
-      when '<'
-        (other.width > self.width && other.height > self.height) ? scaled_to_fit(other) : self
-      when '%'
-        scaled_by(other)
-      when '@'
-        scaled_by(other.width * 100 / (self.width * self.height))
-      else
-        scaled_to_fit(other)
-      end
-    end
-    alias :* :transformed_by
-    
-    # Tests whether two geometries are identical in dimensions and modifier. 
-    def == (other)
-      self.to_s == other.to_s
-    end
-    
-    # Tests whether two geometries have the same dimensions, ignoring modifier.
-    def =~ (other)
-      self.height.to_i == other.height.to_i && self.width.to_i == other.width.to_i
-    end
-    
-    # Scales this geometry to fit within that geometry.
-    def scaled_to_fit(other)
-      if (other.width > 0 && other.height == 0)
-        Geometry.new(other.width, self.height * other.width / self.width)
-      elsif (other.width == 0 && other.height > 0)
-        Geometry.new(self.width * other.height / self.height, other.height)
-      else
-        ratio = Geometry.new( other.width / self.width, other.height / self.height )
-        if ratio.square?
-          other.without_modifier
-        elsif ratio.horizontal?
-          Geometry.new(ratio.height * self.width, other.height)
-        else
-          Geometry.new(other.width, ratio.width * self.height)
-        end
-      end
-    end
-    
-    # Scales this geometry by the percentage(s) specified in that geometry.
-    def scaled_by(other)
-      other = Geometry.new("#{other}%") unless other.is_a? Geometry
-      if other.height > 0
-        Geometry.new(self.width * other.width / 100, self.height * other.height / 100)
-      else
-        Geometry.new(self.width * other.width / 100, self.height * other.width / 100)
-      end
-    end
-  end
-end

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

@@ -1,79 +0,0 @@
-def obtain_class
-  class_name = ENV['CLASS'] || ENV['class']
-  raise "Must specify CLASS" unless class_name
-  @klass = Object.const_get(class_name)
-end
-
-def obtain_attachments
-  name = ENV['ATTACHMENT'] || ENV['attachment']
-  raise "Class #{@klass.name} has no attachments specified" unless @klass.respond_to?(:attachment_definitions)
-  if !name.blank? && @klass.attachment_definitions.keys.include?(name)
-    [ name ]
-  else
-    @klass.attachment_definitions.keys
-  end
-end
-
-def for_all_attachments
-  klass = obtain_class
-  names = obtain_attachments
-  ids   = klass.connection.select_values(klass.send(:construct_finder_sql, :select => 'id'))
-
-  ids.each do |id|
-    instance = klass.find(id)
-    names.each do |name|
-      result = if instance.send("#{ name }?")
-                 yield(instance, name)
-               else
-                 true
-               end
-      print result ? "." : "x"; $stdout.flush
-    end
-  end
-  puts " Done."
-end
-
-namespace :paperclip do
-  desc "Refreshes both metadata and thumbnails."
-  task :refresh => ["paperclip:refresh:metadata", "paperclip:refresh:thumbnails"]
-
-  namespace :refresh do
-    desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT)."
-    task :thumbnails => :environment do
-      errors = []
-      for_all_attachments do |instance, name|
-        result = instance.send(name).reprocess!
-        errors << [instance.id, instance.errors] unless instance.errors.blank?
-        result
-      end
-      errors.each{|e| puts "#{e.first}: #{e.last.full_messages.inspect}" }
-    end
-
-    desc "Regenerates content_type/size metadata for a given CLASS (and optional ATTACHMENT)."
-    task :metadata => :environment do
-      for_all_attachments do |instance, name|
-        if file = instance.send(name).to_file
-          instance.send("#{name}_file_name=", instance.send("#{name}_file_name").strip)
-          instance.send("#{name}_content_type=", file.content_type.strip)
-          instance.send("#{name}_file_size=", file.size) if instance.respond_to?("#{name}_file_size")
-          instance.save(false)
-        else
-          true
-        end
-      end
-    end
-  end
-
-  desc "Cleans out invalid attachments. Useful after you've added new validations."
-  task :clean => :environment do
-    for_all_attachments do |instance, name|
-      instance.send(name).send(:validate)
-      if instance.send(name).valid?
-        true
-      else
-        instance.send("#{name}=", nil)
-        instance.save
-      end
-    end
-  end
-end