rom-factory 0.10.2 → 0.11.0

data/lib/rom/factory/dsl.rb

@@ -1,26 +1,30 @@
 # frozen_string_literal: true
 
-require 'faker'
-require 'dry/core/inflector'
+require "faker"
 
-require 'rom/factory/builder'
-require 'rom/factory/attribute_registry'
-require 'rom/factory/attributes'
+require "rom/factory/builder"
+require "rom/factory/attribute_registry"
+require "rom/factory/attributes"
 
 module ROM
   module Factory
+    extend ::Dry::Core::Cache
+
     class << self
       # @api private
-      def fake(type, *args)
-        api = ::Faker.const_get(::Dry::Core::Inflector.classify(type.to_s))
+      def fake(*args, **options)
+        api = fetch_or_store(:faker, *args) do
+          *ns, method_name = args
 
-        if args[0].is_a?(Symbol)
-          api.public_send(*args)
-        else
-          api.public_send(type, *args)
+          const = ns.reduce(::Faker) do |obj, name|
+            obj.const_get(::Dry::Core::Inflector.camelize(name))
+          end
+
+          const.method(method_name)
         end
+
+        api.(**options)
       end
-      ruby2_keywords(:fake) if respond_to?(:ruby2_keywords, true)
     end
 
     # Factory builder DSL
@@ -33,7 +37,7 @@ module ROM
       attr_reader :_traits
 
       # @api private
-      def initialize(name, attributes: AttributeRegistry.new, relation:, factories:, struct_namespace:)
+      def initialize(name, relation:, factories:, struct_namespace:, attributes: AttributeRegistry.new)
         @_name = name
         @_relation = relation
         @_factories = factories
@@ -83,28 +87,36 @@ module ROM
       #
       #   @param [Symbol] type The value type to generate
       #
-      # @overload fake(api, type)
+      # @overload fake(genre, type)
       #   @example
       #     f.email { fake(:internet, :email) }
       #
-      #   @param [Symbol] api The faker API identifier ie. :internet, :product etc.
+      #   @param [Symbol] genre The faker API identifier ie. :internet, :product etc.
       #   @param [Symbol] type The value type to generate
       #
-      # @overload fake(api, type, *args)
+      # @overload fake(genre, type, **options)
       #   @example
-      #     f.email { fake(:number, :between, 10, 100) }
+      #     f.email { fake(:number, :between, from: 10, to: 100) }
       #
-      #   @param [Symbol] api The faker API identifier ie. :internet, :product etc.
+      #   @param [Symbol] genre The faker API identifier ie. :internet, :product etc.
       #   @param [Symbol] type The value type to generate
-      #   @param [Array] args Additional arguments
+      #   @param [Hash] options Additional arguments
+      #
+      # @overload fake(genre, subgenre, type, **options)
+      #   @example
+      #     f.quote { fake(:books, :dune, :quote, character: 'stilgar') }
+      #
+      #   @param [Symbol] genre The Faker genre of API i.e. :books, :creature, :games etc
+      #   @param [Symbol] subgenre The subgenre of API i.e. :dune, :bird, :myst etc
+      #   @param [Symbol] type the value type to generate
+      #   @param [Hash] options Additional arguments
       #
-      # @see https://github.com/stympy/faker/tree/master/doc
+      # @see https://github.com/faker-ruby/faker/tree/master/doc
       #
       # @api public
-      def fake(*args)
-        ::ROM::Factory.fake(*args)
+      def fake(type, *args, **options)
+        ::ROM::Factory.fake(type, *args, **options)
       end
-      ruby2_keywords(:fake) if respond_to?(:ruby2_keywords, true)
 
       def trait(name, parents = [], &block)
         _traits[name] = DSL.new(
@@ -136,7 +148,7 @@ module ROM
         assoc = _relation.associations[name]
 
         if assoc.is_a?(::ROM::SQL::Associations::OneToOne) && options.fetch(:count, 1) > 1
-          ::Kernel.raise ::ArgumentError, 'count cannot be greater than 1 on a OneToOne'
+          ::Kernel.raise ::ArgumentError, "count cannot be greater than 1 on a OneToOne"
         end
 
         builder = -> { _factories.for_relation(assoc.target) }

data/lib/rom/factory/factories.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/configurable'
-require 'dry/core/inflector'
-
-require 'rom/initializer'
-require 'rom/struct'
-require 'rom/factory/dsl'
-require 'rom/factory/registry'
+require "rom/initializer"
+require "rom/struct"
+require "rom/factory/dsl"
+require "rom/factory/registry"
 
 module ROM::Factory
   # In-memory builder API
@@ -42,7 +39,7 @@ module ROM::Factory
     #
     # @api public
     def [](name, *traits, **attrs)
-      registry[name].struct_namespace(struct_namespace).create(*traits, attrs)
+      registry[name].struct_namespace(struct_namespace).create(*traits, **attrs)
     end
   end
 
@@ -147,7 +144,7 @@ module ROM::Factory
             name,
             relation: relation,
             factories: self,
-            struct_namespace: builder_sturct_namespace(namespace),
+            struct_namespace: builder_struct_namespace(namespace),
             &block
           ).call
         end
@@ -164,13 +161,14 @@ module ROM::Factory
     #   MyFactory[:user, name: "Jane"]
     #
     # @param [Symbol] name The name of the registered factory
-    # @param [Hash] attrs An optional hash with attributes
+    # @param [Array<Symbol>] traits List of traits to apply
+    # @param [Hash] attrs optional attributes to override the defaults
     #
     # @return [ROM::Struct]
     #
     # @api public
-    def [](name, *args)
-      registry[name].struct_namespace(struct_namespace).persistable.create(*args)
+    def [](name, *traits, **attrs)
+      registry[name].struct_namespace(struct_namespace).persistable.create(*traits, **attrs)
     end
 
     # Return in-memory struct builder
@@ -204,8 +202,8 @@ module ROM::Factory
     end
 
     # @api private
-    def builder_sturct_namespace(ns)
-      ns ? { namespace: ns, overridable: false } : { namespace: struct_namespace, overridable: true }
+    def builder_struct_namespace(ns)
+      ns ? {namespace: ns, overridable: false} : {namespace: struct_namespace, overridable: true}
     end
 
     # @api private
@@ -226,7 +224,7 @@ module ROM::Factory
     # @api private
     def extend_builder(name, parent, relation_name, ns, &block)
       namespace = parent.options[:struct_namespace]
-      namespace = builder_sturct_namespace(ns) if ns
+      namespace = builder_struct_namespace(ns) if ns
       relation = rom.relations.fetch(relation_name) { parent.relation }
       DSL.new(
         name,

data/lib/rom/factory/registry.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/factory/constants'
+require "rom/factory/constants"
 
 module ROM
   module Factory
@@ -28,7 +28,7 @@ module ROM
       # @api private
       def [](name)
         elements.fetch(name) do
-          raise FactoryNotDefinedError.new(name)
+          raise FactoryNotDefinedError, name
         end
       end
     end

data/lib/rom/factory/sequences.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'singleton'
+require "singleton"
 
 module ROM
   module Factory

data/lib/rom/factory/tuple_evaluator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rom/factory/sequences'
+require "rom/factory/sequences"
 
 module ROM
   module Factory
@@ -31,13 +31,13 @@ module ROM
       end
 
       # @api private
-      def defaults(traits, attrs, opts = EMPTY_HASH)
-        evaluate(traits, attrs, opts).merge(attrs)
+      def defaults(traits, attrs, **opts)
+        mergeable_attrs = select_mergeable_attrs(traits, attrs)
+        evaluate(traits, attrs, opts).merge(mergeable_attrs)
       end
 
       # @api private
-      def struct(*args)
-        traits, attrs = extract_tuple(args)
+      def struct(*traits, **attrs)
         merged_attrs = struct_attrs.merge(defaults(traits, attrs, persist: false))
         is_callable = proc { |_name, value| value.respond_to?(:call) }
 
@@ -92,28 +92,17 @@ module ROM
         relation.primary_key
       end
 
-      # @api private
-      def extract_tuple(args)
-        if !args.empty? && args.last.is_a?(::Hash)
-          *traits, attrs = args
-
-          [traits, attrs]
-        else
-          [args, EMPTY_HASH]
-        end
-      end
-
       private
 
       # @api private
       def evaluate(traits, attrs, opts)
-        evaluate_values(attrs, opts)
+        evaluate_values(attrs)
           .merge(evaluate_associations(attrs, opts))
           .merge(evaluate_traits(traits, attrs, opts))
       end
 
       # @api private
-      def evaluate_values(attrs, opts)
+      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)
@@ -129,7 +118,7 @@ module ROM
 
         traits_attrs = self.traits.values_at(*traits).flat_map(&:elements)
         registry = AttributeRegistry.new(traits_attrs)
-        self.class.new(registry, relation).defaults([], attrs, opts)
+        self.class.new(registry, relation).defaults([], attrs, **opts)
       end
 
       # @api private
@@ -148,9 +137,9 @@ module ROM
 
       # @api private
       def struct_attrs
-        struct_attrs = relation.schema.
-          reject(&:primary_key?).
-          map { |attr| [attr.name, nil] }.to_h
+        struct_attrs = relation.schema
+          .reject(&:primary_key?)
+          .map { |attr| [attr.name, nil] }.to_h
 
         if primary_key
           struct_attrs.merge(primary_key => next_id)
@@ -163,6 +152,13 @@ module ROM
       def next_id
         sequence.()
       end
+
+      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
+        end
+        attrs.dup.delete_if { |key, _| unmergeable.include?(key) }
+      end
     end
   end
 end

data/lib/rom/factory/version.rb

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

data/lib/rom/factory.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
-require 'dry/core/class_builder'
-require 'rom/factory/factories'
+require "dry/core"
+require "dry/configurable"
+require "dry/struct"
+
+require "rom/factory/factories"
 
 module ROM
   # Main ROM::Factory API
   #
   # @api public
   module Factory
-    DEFAULT_NAME = 'Factories'.freeze
+    DEFAULT_NAME = "Factories"
 
     # Configure a new factory
     #
@@ -23,8 +26,8 @@ module ROM
     #
     # @api public
     def self.configure(name = DEFAULT_NAME, &block)
-      klass = Dry::Core::ClassBuilder.new(name: name, parent: Factories).call do |klass|
-        klass.configure(&block)
+      klass = Dry::Core::ClassBuilder.new(name: name, parent: Factories).call do |c|
+        c.configure(&block)
       end
 
       klass.new(klass.config.rom)

data/lib/rom-factory.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'rom/factory'
+require "rom/factory"

data/project.yml

@@ -1,2 +1,3 @@
 name: rom-factory
+custom_ci: true
 codacy_id: 5fd26fae687549218458879b1a607e18

data/rom-factory.gemspec

@@ -11,26 +11,25 @@ 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 FactoryGirl.}
+  spec.summary       = %q{ROM based builder library to make your specs awesome. DSL partially inspired by FactoryBot.}
   spec.description   = %q{}
   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.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
+  spec.metadata['allowed_push_host'] = "https://rubygems.org"
 
   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.add_dependency "dry-configurable", "~> 0.7"
-  spec.add_dependency "dry-core", "~> 0.4"
-  spec.add_dependency 'faker', '>= 1.7', '< 3.0'
-  spec.add_dependency 'rom-core', '~> 5.0'
+  spec.required_ruby_version = ">= 2.7.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"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rom-factory
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Janis Miezitis
 - Piotr Solnica
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -17,35 +17,49 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -55,7 +69,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -65,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.3'
 description: ''
 email:
 - janjiss@gmail.com
@@ -81,28 +95,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".action_hero.yml"
 - ".devtools/templates/changelog.erb"
-- ".github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md"
-- ".github/ISSUE_TEMPLATE/----please-don-t-report-feature-requests-via-issues.md"
-- ".github/ISSUE_TEMPLATE/---a-detailed-bug-report.md"
-- ".github/ISSUE_TEMPLATE/---bug-report.md"
-- ".github/ISSUE_TEMPLATE/---feature-request.md"
+- ".devtools/templates/release.erb"
+- ".github/FUNDING.yml"
+- ".github/ISSUE_TEMPLATE/bug-report.md"
+- ".github/ISSUE_TEMPLATE/config.yml"
+- ".github/SUPPORT.md"
 - ".github/workflows/ci.yml"
-- ".github/workflows/custom/ci.yml"
 - ".github/workflows/docsite.yml"
+- ".github/workflows/rubocop.yml"
 - ".github/workflows/sync_configs.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".yardopts"
-- Appraisals
 - CHANGELOG.md
+- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.devtools
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - benchmarks/basic.rb
@@ -132,7 +146,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,16 +154,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: ROM based builder library to make your specs awesome. DSL partially inspired
-  by FactoryGirl.
+  by FactoryBot.
 test_files: []

data/.github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md

@@ -1,10 +0,0 @@
----
-name: "⚠️  Please don't ask for support via issues"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

data/.github/ISSUE_TEMPLATE/----please-don-t-report-feature-requests-via-issues.md

@@ -1,10 +0,0 @@
----
-name: "⚠️  Please don't report feature requests via issues"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

data/.github/ISSUE_TEMPLATE/---a-detailed-bug-report.md

@@ -1,30 +0,0 @@
----
-name: "\U0001F41B A detailed bug report"
-about: Report a bug
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Before you submit this: WE ONLY ACCEPT BUG REPORTS**
-
-For more information see [our contribution guidelines](https://github.com/rom-rb/rom/blob/master/CONTRIBUTING.md)
-
-**Describe the bug**
-
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-
-Provide detailed steps to reproduce, an executable script would be best.
-
-**Expected behavior**
-
-A clear and concise description of what you expected to happen.
-
-**Your environment**
-
-- Affects my production application: **YES/NO**
-- Ruby version: ...
-- OS: ...

data/.github/ISSUE_TEMPLATE/---feature-request.md

@@ -1,18 +0,0 @@
----
-name: "\U0001F6E0 Feature request"
-about: See CONTRIBUTING.md for more information
-title: ''
-labels: feature
-assignees: ''
-
----
-
-Summary of what the feature is supposed to do.
-
-## Examples
-
-Code examples showing how the feature could be used.
-
-## Resources
-
-Additional information, like a link to the discussion forum thread where the feature was discussed etc.

data/.github/workflows/custom/ci.yml

@@ -1,26 +0,0 @@
-jobs:
-  tests:
-    services:
-      db:
-        image: postgres:10.8
-        env:
-          POSTGRES_USER: runner
-          POSTGRES_PASSWORD: ""
-          POSTGRES_DB: rom_factory
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-    strategy:
-      matrix:
-        faker:
-          - faker-1
-          - faker-2
-        include:
-          - ruby: "2.6"
-            faker: faker-2
-            coverage: "true"
-          - ruby: jruby
-            database_url: jdbc:postgresql://localhost/rom_factory
-    env:
-      FAKER: ${{matrix.faker}}
-      APT_DEPS: "libpq-dev libmysqlclient-dev libsqlite3-dev"

data/Appraisals

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-appraise 'faker-1' do
-  gem 'faker', '~> 1.7'
-end
-
-appraise 'faker-2' do
-  gem 'faker', '~> 2.8'
-end