dscf-marketplace 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b94e7df1ac8fe6e08df594a8a5509a16b2b6383071208a636a8981a0a6618a
-  data.tar.gz: 78f4ea4db87b33c9ad5027b40a710f5c5070a928c54f2fd3c351321c378d7ef5
+  metadata.gz: 796eeeaf3921a9ddb0e478285af2b644a972cb51a53231a39e7062e7c4b53f0a
+  data.tar.gz: af123ae47644fd07cca78b7e3b4907ef79d530cf96dff069338499ebf908cd0e
 SHA512:
-  metadata.gz: b0b2b27060010f601b6469c685302927b20d6559d13af18fac98ca6abaf0212a255739c1010952f63aeac14033283199fcfee734fdc97fa81f4b8ccdfa301fa6
-  data.tar.gz: 250396abdd9c4f188a0ecb7be10ff9a9c52aafccb0811201b7d923994b56f3fe2e892a6eb3d9a28261788f9dc04e1eb7e5173a7049c840c77b87b5f2924ced9b
+  metadata.gz: d6aa7f04ccb27eb52e027c68a72c429cfdf793d9c7dfde195851b868e6a69296e6328000eed13fd12075dd18ef76f164f6d7a8deee69a1dc31869f809c30da79
+  data.tar.gz: 9a4653a2bbd5b67779a5180ea2dc660971e50485ed6224d86f7904079bdc1302bd6c26bb2c8006761c22f43b9e0f5e335c15db9bbfff8ed6098b83f51a5b9fdc

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

@@ -30,10 +30,10 @@ module Dscf
 
       def convertible_to?(other_unit)
         return false if other_unit.nil?
+        return true if id == other_unit.id
 
-        # NOTE: UnitConversion model not yet implemented
-        # For now, return false - will be implemented when UnitConversion is created
-        false
+        unit_conversions.exists?(to_unit: other_unit) ||
+          other_unit.unit_conversions.exists?(to_unit: self)
       end
     end
   end

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

@@ -0,0 +1,33 @@
+module Dscf
+  module Marketplace
+    class UnitConversion < ApplicationRecord
+      belongs_to :from_unit, class_name: "Dscf::Marketplace::Unit"
+      belongs_to :to_unit, class_name: "Dscf::Marketplace::Unit"
+
+      validates :from_unit_id, presence: true
+      validates :to_unit_id, presence: true
+      validates :conversion_factor, presence: true, numericality: {greater_than: 0}
+      validates :notes, length: {maximum: 500}, allow_blank: true
+
+      validate :units_must_be_different
+
+      def units_must_be_different
+        return unless from_unit_id && to_unit_id
+
+        return unless from_unit_id == to_unit_id
+
+        errors.add(:to_unit_id, "must be different from from_unit")
+      end
+
+      def reverse_conversion_factor
+        return nil unless conversion_factor && conversion_factor != 0
+
+        1.0 / conversion_factor
+      end
+
+      def description
+        "#{from_unit&.display_name} → #{to_unit&.display_name} (×#{conversion_factor})"
+      end
+    end
+  end
+end

data/db/migrate/20250827185656_create_dscf_marketplace_unit_conversions.rb

@@ -0,0 +1,23 @@
+class CreateDscfMarketplaceUnitConversions < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_unit_conversions do |t|
+      t.references :from_unit,
+                   index: {name: "from_unit_on_dm_uc_indx"},
+                   null: false,
+                   foreign_key: {to_table: :dscf_marketplace_units}
+      t.references :to_unit,
+                   index: {name: "to_unit_on_dm_uc_indx"},
+                   null: false,
+                   foreign_key: {to_table: :dscf_marketplace_units}
+      t.decimal :conversion_factor, precision: 15, scale: 6, null: false
+      t.string :notes, limit: 500
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_unit_conversions,
+              %i[from_unit_id to_unit_id],
+              unique: true,
+              name: "unique_unit_conversion_indx"
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.2".freeze
+    VERSION = "0.1.3".freeze
   end
 end

data/spec/factories/dscf/marketplace/unit_conversions.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :dscf_marketplace_unit_conversion, class: "Dscf::Marketplace::UnitConversion" do
+    from_unit { create(:dscf_marketplace_unit) }
+    to_unit { create(:dscf_marketplace_unit) }
+    conversion_factor { 1.5 }
+    notes { "Conversion factor description" }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Asrat
@@ -423,15 +423,18 @@ files:
 - app/models/dscf/marketplace/application_record.rb
 - app/models/dscf/marketplace/category.rb
 - app/models/dscf/marketplace/unit.rb
+- app/models/dscf/marketplace/unit_conversion.rb
 - config/routes.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb
 - db/migrate/20250827173526_update_dscf_marketplace_categories_indexes.rb
 - db/migrate/20250827182550_create_dscf_marketplace_units.rb
+- db/migrate/20250827185656_create_dscf_marketplace_unit_conversions.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb
 - lib/tasks/dscf/marketplace_tasks.rake
 - spec/factories/dscf/marketplace/categories.rb
+- spec/factories/dscf/marketplace/unit_conversions.rb
 - spec/factories/dscf/marketplace/units.rb
 homepage: https://mksaddis.com/
 licenses:
@@ -446,7 +449,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="