effective_resources 2.8.2 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0140383360a1897a1b21a4a5897f5e61d9099210ab1fca6fe8e93159c7bdc999'
-  data.tar.gz: 33819637928fe7fdb8e75df61f79526228652142fc76ab09222bed6ed9f91e6a
+  metadata.gz: 13d2181e7cf9ab5d68d9b25302761489380f890e0c9046e545a5c2fcb854be0b
+  data.tar.gz: e4639dbcdb1cd89cebe4c0a196c5cf973b089b35cf24261a3c1ea70854fb5c59
 SHA512:
-  metadata.gz: 490636b3efc23c0406833448528f2e8029d9d707a49db92309eda2d65fff6be90d7c31c9d835827866d953b9c18a13781aeb11b43f606c411b051037f0c6f1ed
-  data.tar.gz: 1dc0516ce102fac154bfc374deee17678f4d4f33906a2e90bf96e175d5af0573faff5800749c5fff3f198110a3ef142b3fdb1b341e21aef3656a1388e6c4352b
+  metadata.gz: e2ee62822958ebf3be1872c0926c10cae4ffa140aab91e9201b4dc781222f6ee8f92f8bf0269209296c6dc334f49fc13582e6f71e7d42f3ae081059fa3c5bd2d
+  data.tar.gz: 55894ca40b3e35d3ac800715bf9c906af9253cc3bad75b5a8a4bb01b2cb9b36b5e2d1f9a74818ac9ccfd72a70305f64c7f94a519afd66a21a6184e0d6a5d1679

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -31,7 +31,7 @@ module Effective
 
         # Duplicate if possible
         if params[:duplicate_id]
-          duplicate = resource_scope.find_by_id(params[:duplicate_id])
+          duplicate = resource_scope.find_by_id(params[:duplicate_id]) || resource_scope.find(params[:duplicate_id])
           EffectiveResources.authorize!(self, :show, duplicate)
 
           self.resource = duplicate_resource(duplicate)

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -72,8 +72,10 @@ module ActsAsPurchasableWizard
     # From Billing Step
     order.billing_address = owner.billing_address if owner.try(:billing_address).present?
 
+    # This will update all order items to match the prices from their
+    order.try(:update_purchasable_attributes)
+
     # Important to add/remove anything
-    # This will update the prices, but the purchasables must be persisted
     order.save!
 
     order

data/app/validators/content_type_validator.rb

@@ -0,0 +1,50 @@
+#
+# Custom validator for attachments' content types
+#
+# @example
+#
+#   -> validates :image, content_type: :image
+#   -> validates :image, content_type: [:jpg, :webp]
+#   -> validates :image, content_type: [:image, :pdf]
+#   -> validates :image, content_type: { in: :image, message: 'must be a valid image' }
+#
+class ContentTypeValidator < ActiveModel::EachValidator
+  EXPANSIONS = {
+    image:        %i[png jpeg jpg jpe pjpeg gif bmp svg webp],
+    document:     %i[text txt docx doc xml pdf csv],
+    calendar:     %i[ics],
+    spreadsheet:  %i[xlsx xls],
+    video:        %i[mpeg mpg mp3 m4a mpg4 aac webm mp4 m4v],
+  }.freeze
+
+  def validate_each(record, attribute, value)
+    # Support for optional attachments
+    return unless value.present? && value.attached?
+
+    keys   = EXPANSIONS.keys
+    values = EXPANSIONS.values.flatten
+    options = instance_values["options"]
+    message = options.try(:[], :message) || "must have a valid content type"
+    types = options[:with] || options[:in]
+
+    # Ensure array and ensure symbols
+    types = [types].flatten.compact.map(&:to_sym)
+
+    allowed_types = []
+    types.each do |types|
+      if types.in?(keys)
+        allowed_types << EXPANSIONS[types]
+      elsif types.in?(values)
+        allowed_types << types
+      else
+        raise("unknown content_type types: #{types}")
+      end
+    end
+    allowed_types = allowed_types.flatten.map(&:to_sym).uniq
+
+    unless value.filename.extension.to_sym.in?(allowed_types)
+      record.errors.add(attribute, message)
+    end
+
+  end
+end

data/app/validators/size_validator.rb

@@ -0,0 +1,23 @@
+#
+# Custom validator for file sizes
+#
+# @example
+#
+#   -> validates :image, size: { less_than: 2.megabytes }
+#   -> validates :image, size: { less_than: 2.megabytes, message: 'is too large, please upload a file smaller than 2MB' }
+#
+class SizeValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return unless value.present? && value.attached?
+
+    options = instance_values["options"]
+
+    max_size = options.try(:[], :less_than) || 2.megabytes
+    message = options.try(:[], :message) || "is too large, please upload a file smaller than #{max_size / 1.megabyte}MB"
+
+    if value.blob.byte_size > max_size
+      record.errors.add(attribute, message)
+    end
+
+  end
+end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.8.2'.freeze
+  VERSION = '2.8.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,6 +223,8 @@ files:
 - app/models/effective/resources/relation.rb
 - app/models/effective/resources/sql.rb
 - app/models/effective/resources/tenants.rb
+- app/validators/content_type_validator.rb
+- app/validators/size_validator.rb
 - app/views/application/_flash.html.haml
 - app/views/application/create.js.erb
 - app/views/application/destroy.js.erb