rom-factory 0.11.0 → 0.13.0

data/lib/rom/factory/tuple_evaluator.rb

@@ -6,6 +6,29 @@ module ROM
   module Factory
     # @api private
     class TupleEvaluator
+      class TupleEvaluatorError < StandardError
+        attr_reader :original_exception
+
+        def initialize(relation, original_exception, attrs, traits, assoc_attrs)
+          super(<<~STR)
+            Failed to build attributes for #{relation.name}
+
+            Attributes:
+              #{attrs.inspect}
+
+            Associations:
+              #{assoc_attrs}
+
+            Traits:
+              #{traits.inspect}
+
+            Original exception: #{original_exception.message}
+          STR
+
+          set_backtrace(original_exception.backtrace)
+        end
+      end
+
       # @api private
       attr_reader :attributes
 
@@ -15,9 +38,6 @@ module ROM
       # @api private
       attr_reader :traits
 
-      # @api private
-      attr_reader :model
-
       # @api private
       attr_reader :sequence
 
@@ -26,10 +46,13 @@ module ROM
         @attributes = attributes
         @relation = relation.with(auto_struct: true)
         @traits = traits
-        @model = @relation.combine(*assoc_names).mapper.model
         @sequence = Sequences[relation]
       end
 
+      def model(traits, combine: assoc_names(traits))
+        @relation.combine(*combine).mapper.model
+      end
+
       # @api private
       def defaults(traits, attrs, **opts)
         mergeable_attrs = select_mergeable_attrs(traits, attrs)
@@ -45,21 +68,41 @@ module ROM
         attributes = merged_attrs.reject(&is_callable)
 
         materialized_callables = {}
-        callables.each do |_name, callable|
+        callables.each_value do |callable|
           materialized_callables.merge!(callable.call(attributes, persist: false))
         end
 
         attributes.merge!(materialized_callables)
 
-        associations = assoc_names
-          .map { |key| [key, attributes[key]] if attributes.key?(key) }
-          .compact
+        assoc_attrs = attributes.slice(*assoc_names(traits)).merge(
+          assoc_names(traits)
+            .select { |key|
+              build_assoc?(key, attributes)
+            }
+            .map { |key|
+              [key, build_assoc_attrs(key, attributes[relation.primary_key], attributes[key])]
+            }
           .to_h
+        )
+
+        model_attrs = relation.output_schema[attributes]
+        model_attrs.update(assoc_attrs)
+
+        model(traits).new(**model_attrs)
+      rescue StandardError => e
+        raise TupleEvaluatorError.new(relation, e, attrs, traits, assoc_attrs)
+      end
 
-        attributes = relation.output_schema[attributes]
-        attributes.update(associations)
+      def build_assoc?(name, attributes)
+        attributes.key?(name) && attributes[name] != [] && !attributes[name].nil?
+      end
 
-        model.new(attributes)
+      def build_assoc_attrs(key, fk, value)
+        if value.is_a?(Array)
+          value.map { |el| build_assoc_attrs(key, fk, el) }
+        else
+          {attributes[key].foreign_key => fk}.merge(value.to_h)
+        end
       end
 
       # @api private
@@ -76,10 +119,15 @@ module ROM
       end
 
       def assocs(traits_names = [])
-        traits
+        found_assocs = traits
           .values_at(*traits_names)
+          .compact
           .map(&:associations).flat_map(&:elements)
           .inject(AttributeRegistry.new(attributes.associations.elements), :<<)
+
+        exclude = traits_names.select { |t| t.is_a?(Hash) }.reduce(:merge) || EMPTY_HASH
+
+        found_assocs.reject { |a| exclude[a.name] == false }
       end
 
       # @api private
@@ -97,15 +145,15 @@ module ROM
       # @api private
       def evaluate(traits, attrs, opts)
         evaluate_values(attrs)
-          .merge(evaluate_associations(attrs, opts))
+          .merge(evaluate_associations(traits, attrs, opts))
           .merge(evaluate_traits(traits, attrs, opts))
       end
 
       # @api private
       def evaluate_values(attrs)
-        attributes.values.tsort.each_with_object({}) do |attr, h|
-          deps = attr.dependency_names.map { |k| h[k] }.compact
-          result = attr.(attrs, *deps)
+        attributes.values.tsort.each_with_object(attrs.dup) do |attr, h|
+          deps = attr.dependency_names.filter_map { |k| h[k] }
+          result = attr.(h, *deps)
 
           if result
             h.update(result)
@@ -113,24 +161,29 @@ module ROM
         end
       end
 
-      def evaluate_traits(traits, attrs, opts)
-        return {} if traits.empty?
+      def evaluate_traits(trait_list, attrs, opts)
+        return EMPTY_HASH if trait_list.empty?
+
+        traits = trait_list.map { |v| v.is_a?(Hash) ? v : {v => true} }.reduce(:merge)
 
-        traits_attrs = self.traits.values_at(*traits).flat_map(&:elements)
+        traits_attrs = self.traits.select { |key, _value| traits[key] }.values.flat_map(&:elements)
         registry = AttributeRegistry.new(traits_attrs)
+
         self.class.new(registry, relation).defaults([], attrs, **opts)
       end
 
       # @api private
-      def evaluate_associations(attrs, opts)
-        attributes.associations.each_with_object({}) do |assoc, h|
-          if assoc.dependency?(relation)
-            h[assoc.name] = ->(parent, call_opts) do
+      def evaluate_associations(traits, attrs, opts)
+        assocs(traits).associations.each_with_object({}) do |assoc, memo|
+          if attrs.key?(assoc.name) && attrs[assoc.name].nil?
+            memo
+          elsif assoc.dependency?(relation)
+            memo[assoc.name] = ->(parent, call_opts) do
               assoc.call(parent, **opts, **call_opts)
             end
           else
             result = assoc.(attrs, **opts)
-            h.update(result) if result
+            memo.update(result) if result
           end
         end
       end
@@ -155,7 +208,7 @@ module ROM
 
       def select_mergeable_attrs(traits, attrs)
         unmergeable = assocs(traits).select(&:through?).map do |a|
-          Dry::Core::Inflector.singularize(a.assoc.target.name.to_sym).to_sym
+          ::ROM::Inflector.singularize(a.assoc.target.name.to_sym).to_sym
         end
         attrs.dup.delete_if { |key, _| unmergeable.include?(key) }
       end

data/lib/rom/factory/version.rb

@@ -2,6 +2,6 @@
 
 module ROM
   module Factory
-    VERSION = "0.11.0"
+    VERSION = "0.13.0"
   end
 end

data/rom-factory.gemspec

@@ -1,9 +1,8 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rom/factory/version'
+require "rom/factory/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "rom-factory"
@@ -11,25 +10,26 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Janis Miezitis", "Piotr Solnica"]
   spec.email         = ["janjiss@gmail.com", "piotr.solnica@gmail.com"]
 
-  spec.summary       = %q{ROM based builder library to make your specs awesome. DSL partially inspired by FactoryBot.}
-  spec.description   = %q{}
+  spec.summary       = "ROM based builder library to make your specs awesome. DSL partially inspired by FactoryBot."
+  spec.description   = ""
   spec.homepage      = "https://github.com/rom-rb/rom-factory"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  spec.metadata["allowed_push_host"]     = "https://rubygems.org"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
-  spec.add_runtime_dependency "dry-configurable", "~> 1.0"
-  spec.add_runtime_dependency "dry-core", "~> 1.0"
-  spec.add_runtime_dependency "dry-struct", "~> 1.6"
-  spec.add_runtime_dependency "faker", ">= 2.0", "< 3.0"
-  spec.add_runtime_dependency "rom-core", "~> 5.3"
+  spec.add_dependency "dry-configurable", "~> 1.3"
+  spec.add_dependency "dry-core", "~> 1.1"
+  spec.add_dependency "dry-struct", "~> 1.7"
+  spec.add_dependency "faker", ">= 2.0", "< 4"
+  spec.add_dependency "rom-core", "~> 5.4"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-factory
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Janis Miezitis
 - Piotr Solnica
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -17,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +61,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,21 +71,21 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rom-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
 description: ''
 email:
 - janjiss@gmail.com
@@ -95,7 +94,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".action_hero.yml"
 - ".devtools/templates/changelog.erb"
 - ".devtools/templates/release.erb"
 - ".github/FUNDING.yml"
@@ -107,11 +105,12 @@ files:
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/sync_configs.yml"
 - ".gitignore"
+- ".postgres.env"
+- ".repobot.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".yardopts"
 - CHANGELOG.md
-- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -121,6 +120,7 @@ files:
 - Rakefile
 - benchmarks/basic.rb
 - changelog.yml
+- compose.yml
 - docsite/source/index.html.md
 - lib/rom-factory.rb
 - lib/rom/factory.rb
@@ -146,7 +146,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -154,15 +154,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: ROM based builder library to make your specs awesome. DSL partially inspired
   by FactoryBot.

data/CODEOWNERS

@@ -1 +0,0 @@
-* @solnic