dscf-marketplace 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ccdaa6c3f673186ebd2eded4b02d820ca4a5f04c488289a7ae36fd632e86cf
-  data.tar.gz: ddc2b3716afba0714a92f9fd3814598eedffd39288a8a01e99eca5c36d320bdc
+  metadata.gz: 304ba75880abb6975ba1f97e4268071bafa178d04393d61ff3978c98814f3e3a
+  data.tar.gz: 49ba3cbb962c0c515cad40759cdb427fe98e848190b015a48509727b81da774b
 SHA512:
-  metadata.gz: 3dfed84c310ca8365fb97fa54fa9dc46fa9a1603119cf2a05ed0a46c0c1de8834792ad6d03a3427feaf123ce2b0e19392f487e45a79a3c0fd00d5c1350e9d521
-  data.tar.gz: 0b68966531e15177a951d62f3737a91f1246f16ac17a3ce72b716fd7efdf1d995c1443fa594fbeea3dc508e6d5eb065d2d42d11ed18b01e639288bd7ed3d53d0
+  metadata.gz: e424c88f7009a765386e4537affad040fa7adeac0196842707eb5fa347bead1c966542f893e4f4eb0b911ba598fb203d02c6020d128ee1451ced4090ad9333e6
+  data.tar.gz: 3a8f804ab3749994f2f39c536e495cc7533a866075588c6665ae9ab5af93295d2ffeef48f8063a7ddc6526e9aed30268bc13bd05598899fbfbbb924454244150

data/app/models/dscf/marketplace/product.rb

@@ -56,15 +56,30 @@ module Dscf
       end
 
       def thumbnail_url
-        return nil unless thumbnail.attached?
-        Rails.application.routes.url_helpers.rails_blob_url(thumbnail, host: Rails.application.config.action_mailer.default_url_options[:host])
+        attachment_url_for(thumbnail)
       end
 
       def images_urls
         return [] unless images.attached?
-        images.map do |image|
-          Rails.application.routes.url_helpers.rails_blob_url(image, host: Rails.application.config.action_mailer.default_url_options[:host])
+        images.map { |image| attachment_url_for(image) }
+      end
+
+      private
+        def attachment_url_for(attachment)
+          return unless attachment.present?
+          return if attachment.respond_to?(:attached?) && !attachment.attached?
+
+          Rails.application.routes.url_helpers.rails_blob_url(attachment, **active_storage_url_options)
         end
+
+        def active_storage_url_options
+          url_options = Rails.application.config.x.active_storage_url_options.presence ||
+            Rails.application.routes.default_url_options.presence ||
+            Rails.application.config.action_controller.default_url_options.presence ||
+            Rails.application.config.action_mailer.default_url_options.presence ||
+            {}
+
+          url_options.to_h.symbolize_keys.compact
       end
     end
   end

data/app/serializers/dscf/marketplace/product_serializer.rb

@@ -10,21 +10,11 @@ module Dscf
       has_many :supplier_products
 
       def thumbnail_url
-        if object.thumbnail.attached?
-          ActiveStorage::Current.set(url_options: { host: "dscf.bitscollege.edu.et", protocol: "https", script_name: "/api" }) do
-            object.thumbnail.url
-          end
-        end
+        object.thumbnail_url
       end
 
       def image_urls
-        if object.images.attached?
-          ActiveStorage::Current.set(url_options: { host: "dscf.bitscollege.edu.et", protocol: "https", script_name: "/api" }) do
-            object.images.map(&:url)
-          end
-        else
-          []
-        end
+        object.images_urls
       end
     end
   end

data/config/environments/production.rb

@@ -1,7 +1,13 @@
 Rails.application.configure do
-  # Set the host for URL generation
-  config.action_mailer.default_url_options = { host: "dscf.bitscollege.edu.et" }
-  config.action_controller.default_url_options = { host: "dscf.bitscollege.edu.et" }
+  config.x.active_storage_url_options = {
+    host: ENV.fetch("ACTIVE_STORAGE_HOST", "dscf-api.bitscollege.edu.et"),
+    protocol: ENV.fetch("ACTIVE_STORAGE_PROTOCOL", "https"),
+    script_name: ENV.fetch("ACTIVE_STORAGE_SCRIPT_NAME", "/api")
+  }
+
+  config.action_mailer.default_url_options = config.x.active_storage_url_options.dup
+  config.action_controller.default_url_options = config.x.active_storage_url_options.dup
+  Rails.application.routes.default_url_options.merge!(config.x.active_storage_url_options)
 
   config.force_ssl = true
 end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.6.9".freeze
+    VERSION = "0.6.10".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-01-01 00:00:00.000000000 Z
+date: 2026-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails