rom-factory 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef868642e36f9a4e7b18c91925f378a2c0da27bd4c7ac6d048650c0c739ce3d9
-  data.tar.gz: 8815cd6d8318b35298ff341e5308e7b76692be6d6af58b076a9c5ddd23688bd2
+  metadata.gz: 946c06da46cc1d12ac8e90fc8b79661ce43e9ed2ab2ba0e3ffd93f5c1ac7e419
+  data.tar.gz: fa2c475a578ba75f7574ed5d883a4432fc4f2328849fc4be74813b854a0c6dba
 SHA512:
-  metadata.gz: fb80a101f1b6c380ee4660d49756c02a0af58ed60d8c53d7a97ba5f94b5a04b37255a11018c7f47fe0665b71ba4a47ee70c65b1c6418c0d642b7e662bc5beffa
-  data.tar.gz: 9f74c1af825e6927a2f1926963c39ac41b7b74471e2795cd6e8b28d1aca839c8fe1a1c688d4116e371a759ababa0b5df3147fcf8ae6b15fc0aaa5418fc4af9db
+  metadata.gz: b1dea330b287e3b56c2acaea898c9139317b0de709098c0c7525d05215db34571dfa41447337ca39b39f7d1d5ace98fde9f442854a725870fa6496c24d00eee3
+  data.tar.gz: 6279eb190440aeb10dc03c26fe18cfcc67f846e8d0981b7822746172f564936f5d2fd7cbf41a68336be1865516afda03947302804db8d6a1e05040198137beb9

data/.github/workflows/ci.yml

@@ -2,20 +2,10 @@
 name: ci
 on:
   push:
-    paths:
-    - ".github/workflows/ci.yml"
-    - lib/**
-    - "*.gemspec"
-    - spec/**
-    - Rakefile
-    - Gemfile
-    - Gemfile.devtools
-    - ".rubocop.yml"
-    - project.yml
   pull_request:
-    branches:
-    - master
   create:
+  schedule:
+    - cron: "30 4 * * *"
 jobs:
   tests:
     runs-on: ubuntu-latest
@@ -23,13 +13,15 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+        - '3.4'
+        - '3.3'
+        - '3.2'
         - '3.1'
-        - '3.0'
-        - '2.7'
     env:
       COVERAGE: "${{matrix.coverage}}"
       COVERAGE_TOKEN: "${{secrets.CODACY_PROJECT_TOKEN}}"
       APT_DEPS: libpq-dev libmysqlclient-dev libsqlite3-dev
+      DATABASE_URL: "postgres://rom-factory:rom-factory@localhost:5432/rom_factory"
     steps:
     - name: Checkout
       uses: actions/checkout@v1
@@ -55,10 +47,10 @@ jobs:
         coverage-reports: coverage/coverage.xml
     services:
       db:
-        image: postgres:10.8
+        image: postgres:16.1
         env:
-          POSTGRES_USER: runner
-          POSTGRES_PASSWORD: ''
+          POSTGRES_USER: rom-factory
+          POSTGRES_PASSWORD: rom-factory
           POSTGRES_DB: rom_factory
         ports:
         - 5432:5432
@@ -78,10 +70,18 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: "3.1"
     - name: Install dependencies
       run: gem install ossy --no-document
     - name: Trigger release workflow
       run: |
         tag=$(echo $GITHUB_REF | cut -d / -f 3)
         ossy gh w rom-rb/devtools release --payload "{\"tag\":\"$tag\",\"sha\":\"${{github.sha}}\",\"tag_creator\":\"$GITHUB_ACTOR\",\"repo\":\"$GITHUB_REPOSITORY\",\"repo_name\":\"${{github.event.repository.name}}\"}"
+
+  workflow-keepalive:
+    if: github.event_name == 'schedule'
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - uses: liskin/gh-workflow-keepalive@v1

data/.github/workflows/docsite.yml

@@ -22,9 +22,9 @@ jobs:
       - run: |
           git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.6.x"
+          ruby-version: "3.1"
       - name: Set up git user
         run: |
           git config --local user.email "rom-bot@rom-rb.org"
@@ -60,4 +60,3 @@ jobs:
           GITHUB_LOGIN: rom-bot
           GITHUB_TOKEN: ${{secrets.GH_PAT}}
         run: ossy github workflow rom-rb/rom-rb.org ci
-

data/.github/workflows/sync_configs.yml

@@ -1,31 +1,25 @@
 # This file is synced from rom-rb/template-gem repo
 
-name: Changelog
+name: sync
 
 on:
+  repository_dispatch:
   push:
-    paths:
-      - "changelog.yml"
     branches:
       - "main"
-  pull_request:
-    branches:
-      - "main"
-    types: [closed]
 
 jobs:
-  sync:
+  main:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true
-    name: Update
+    if: (github.event_name == 'repository_dispatch' && github.event.action == 'sync_configs') || github.event_name != 'repository_dispatch'
     env:
       GITHUB_LOGIN: rom-bot
       GITHUB_TOKEN: ${{ secrets.GH_PAT }}
     steps:
       - name: Checkout ${{github.repository}}
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
       - name: Checkout devtools
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: rom-rb/devtools
           path: tmp/devtools
@@ -34,9 +28,9 @@ jobs:
           git config --local user.email "rom-bot@rom-rb.org"
           git config --local user.name "rom-bot"
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.6"
+          ruby-version: "3.1"
       - name: Install dependencies
         run: gem install ossy --no-document
       - name: Update changelog.yml from commit
@@ -46,7 +40,7 @@ jobs:
       - name: Commit
         run: |
           git add -A
-          git commit -m "Update CHANGELOG.md" || echo "nothing to commit"
+          git commit -m "[devtools] sync" || echo "nothing to commit"
       - name: Push changes
         run: |
           git pull --rebase origin main

data/.postgres.env

@@ -0,0 +1,4 @@
+POSTGRES_USER="rom"
+POSTGRES_PASSWORD="password"
+POSTGRES_DATABASE="rom_factory"
+POSTGRES_HOST_AUTH_METHOD="trust"

data/{.action_hero.yml → .repobot.yml}

@@ -1,12 +1,17 @@
+###########################################################
+# DO NOT EDIT THIS FILE
+#
 # This is a config synced from rom-rb/template-gem repo
+###########################################################
 
 sources:
   - repo: rom-rb/template-gem
     sync:
-      - "!.github/workflows/ci.yml.erb"
-      - ".action_hero.yml.erb"
+      - ".repobot.yml.erb"
       - ".devtools/templates/*.sync:${{dir}}/${{name}}"
       - ".github/**/*.*"
+      - ".rspec"
+      - ".rubocop.yml"
       - "spec/support/*"
       - "CODE_OF_CONDUCT.md"
       - "CONTRIBUTING.md"
@@ -14,8 +19,6 @@ sources:
       - "LICENSE.erb"
       - "README.erb"
       - "Gemfile.devtools"
-      - ".rspec"
-      - ".rubocop.yml"
-  - repo: action-hero/workflows
+  - repo: repobot-app/workflows
     sync:
       - ".github/workflows/*.yml"

data/.rubocop.yml

@@ -1,7 +1,7 @@
 # This is a config synced from rom-rb/template-gem repo
 AllCops:
-  TargetRubyVersion: 2.7
-  NewCops: disable
+  TargetRubyVersion: 3.1
+  NewCops: enable
   SuggestExtensions: false
   Exclude:
     - spec/support/coverage.rb

data/CHANGELOG.md

@@ -1,35 +1,85 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
-## 0.11.0 2022-11-11
+## 0.13.0 2025-01-21
+
+
+### Added
+
+- Support for unique options in `fake` DSL (via #94) (@sean-dickinson)
+
+```ruby
+Factory.define(:user) do |f|
+  f.name { fake(:name, unique: true) }
+end
+```
+
+Be advised there's `Faker::UniqueGenerator.clear` to clear the cache of unique values.
+
+- Support for setting traits with a keyword argument for associations (via #84) (@parndt)
+
+```ruby
+Factory.define :category do |f|
+  f.association :image, traits: [:fancy]
+end
+```
+
+
+### Changed
+
+- Minimum Ruby version is now 3.1 (@flash-gordon)
+
+[Compare v0.12.0...v0.13.0](https://github.com/rom-rb/rom-factory/compare/v0.12.0...v0.13.0)
+
+## 0.12.0 2024-01-19
+
+
+### Added
+
+- Support for many-to-many and one-to-one-through associations (via #86) (@solnic)
+- Support for UUID as PKs in associations (via #87) (@solnic)
 
 ### Fixed
 
-- Support for plural Faker generators (@wuarmin)
+- Relations without PKs should work too (via #87) (@solnic)
+- Relations with PK values generated on the Ruby side should work in SQlite too (via #87) (@solnic)
+
+
+[Compare v0.11.0...v0.12.0](https://github.com/rom-rb/rom-factory/compare/v0.11.0...v0.12.0)
+
+## 0.11.0 2022-11-11
+
 
 ### Added
 
 - Support for one-to-one associations (@ianks)
 - [internal] cache for Faker constants (@flash-gordon)
 
+### Fixed
+
+- Support for plural Faker generators (@wuarmin)
+
 ### Changed
 
 - [BREAKING] attributes are always passed as keywords (@alassek)
-  This may affect your code in places where attributes are passed as hashes.
-  Places like
+This may affect your code in places where attributes are passed as hashes.
+Places like
+
+```ruby
+user_attributes = { name: 'Jane' }
+Factory[:user, user_attributes]
+
+```
+
+must be updated to
+
+```ruby
+user_attributes = { name: 'Jane' }
+Factory[:user, **user_attributes]
+```
 
-  ```ruby
-  user_attributes = { name: 'Jane' }
-  Factory[:user, user_attributes]
-  ```
-  must be updated to
-  ```ruby
-  user_attributes = { name: 'Jane' }
-  Factory[:user, **user_attributes]
-  ```
 - Upgraded to the latest versions of dry-rb dependencies, compatible with rom 5.3 (@flash-gordon)
 - Support for Faker 1.x was dropped (@alassek)
 
-
 [Compare v0.10.2...v0.11.0](https://github.com/rom-rb/rom-factory/compare/v0.10.2...v0.11.0)
 
 ## 0.10.2 2020-04-05

data/Gemfile

@@ -6,28 +6,38 @@ gemspec
 
 eval_gemfile "Gemfile.devtools"
 
-gem "faker", "~> 2.8"
+gem "faker", "~> 3.0"
 
 gem "rspec", "~> 3.0"
 
-git "https://github.com/rom-rb/rom.git", branch: "release-5.3" do
-  gem "rom-core"
+gem "dotenv"
+
+git "https://github.com/rom-rb/rom.git", branch: "release-5.4" do
+  gem "rom"
   gem "rom-changeset"
+  gem "rom-core"
   gem "rom-repository"
-  gem "rom"
 end
 
 group :test do
-  gem "pry", "~> 0.12.0", "<= 0.13"
-  gem "pry-byebug", "~> 3.8", platforms: :ruby
-  gem "rom-sql", github: "rom-rb/rom-sql", branch: "release-3.6"
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4")
+    gem "debug"
+  else
+    gem "pry"
+    gem "pry-byebug", "~> 3.8", platforms: :ruby
+  end
+  gem "rom-sql", github: "rom-rb/rom-sql", branch: "release-3.7"
 
   gem "jdbc-postgres", platforms: :jruby
-  gem "pg", "~> 0.21", platforms: :ruby
+  gem "pg", "~> 1.5", platforms: :ruby
 end
 
 group :tools do
-  gem "byebug", platform: :mri
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4")
+    gem "byebug", platform: :mri
+  else
+    gem "pry-byebug", "~> 3.8", platforms: :ruby
+  end
   gem "redcarpet" # for yard
 end
 

data/Gemfile.devtools

@@ -16,5 +16,5 @@ end
 
 group :tools do
   # this is the same version that we use on codacy
-  gem "rubocop", "1.26.1"
+  gem "rubocop", "1.69.2"
 end

data/README.md

@@ -21,8 +21,8 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI >= `3.1`
+* jruby >= `9.4` (not tested in CI)
 
 ## License
 

data/changelog.yml

@@ -1,19 +1,54 @@
 ---
+- version: 0.13.0
+  date: 2025-01-21
+  added:
+    - |
+      Support for unique options in `fake` DSL (via #94) (@sean-dickinson)
+
+      ```ruby
+      Factory.define(:user) do |f|
+        f.name { fake(:name, unique: true) }
+      end
+      ```
+
+      Be advised there's `Faker::UniqueGenerator.clear` to clear the cache of unique values.
+    - |
+      Support for setting traits with a keyword argument for associations (via #84) (@parndt)
+
+      ```ruby
+      Factory.define :category do |f|
+        f.association :image, traits: [:fancy]
+      end
+      ```
+  changed:
+    - Minimum Ruby version is now 3.1 (@flash-gordon)
+- version: 0.12.0
+  date: 2024-01-19
+  added:
+    - "Support for many-to-many and one-to-one-through associations (via #86) (@solnic)"
+    - "Support for UUID as PKs in associations (via #87) (@solnic)"
+  fixed:
+    - "Relations without PKs should work too (via #87) (@solnic)"
+    - "Relations with PK values generated on the Ruby side should work in SQlite too (via #87) (@solnic)"
 - version: 0.11.0
   date: 2022-11-11
   added:
-    - Support for one-to-one associations (@ianks)
+    - "Support for one-to-one associations (@ianks)"
     - "[internal] cache for Faker constants (@flash-gordon)"
   changed:
     - |
       [BREAKING] attributes are always passed as keywords (@alassek)
       This may affect your code in places where attributes are passed as hashes.
       Places like
+
       ```ruby
       user_attributes = { name: 'Jane' }
       Factory[:user, user_attributes]
+
       ```
+
       must be updated to
+
       ```ruby
       user_attributes = { name: 'Jane' }
       Factory[:user, **user_attributes]

data/compose.yml

@@ -0,0 +1,7 @@
+---
+services:
+  db:
+    image: postgres
+    ports:
+      - 5432
+    env_file: .postgres.env

data/docsite/source/index.html.md

@@ -44,7 +44,7 @@ end
 
 #### Specify namespace for your structs
 
-Struct `User` will be find in MyApp::Entities namespace
+Struct `User` will be found in `MyApp::Entities` namespace
 
 ```ruby
 Factory.define(:user, struct_namespace: MyApp::Entities) do |f|
@@ -86,7 +86,7 @@ end
 
 Factory.define(:user) do |f|
   f.name 'John'
-  f.association(:user)
+  f.association(:group)
 end
 ```
 
@@ -115,7 +115,7 @@ Factory.define(admin: :user) do |f|
   f.admin true
 end
 
-# Factory.structs(:admin)
+# Factory.structs[:admin]
 ```
 
 #### Traits
@@ -130,7 +130,7 @@ Factory.define(:user) do |f|
   end
 end
 
-# Factory.structs(:user, :with_age)
+# Factory.structs[:user, :with_age]
 ```
 
 #### Build-in [Faker](https://github.com/faker-ruby/faker) objects
@@ -141,6 +141,14 @@ Factory.define(:user) do |f|
 end
 ```
 
+##### Unique values with fake
+Passing the unique: true option will use Faker's [unique](https://github.com/faker-ruby/faker#ensuring-unique-values) feature  
+```ruby
+Factory.define(:user) do |f|
+  f.email { fake(:internet, :email, unique: true) }
+end
+```
+
 #### Dependent attributes
 
 Attributes can be based on the values of other attributes:
@@ -159,11 +167,15 @@ end
 
 ```ruby
 # Create in-memory object
-Factory.structs[:user]
+Factory.build(:user)
 
 # Persist struct in database
-Factory[:user]
+Factory.create(:user)
 
 # Override attributes
-Factory[:user, age: 24]
+Factory.create(:user, age: 24)
+
+# Build and Create via #[] accessors
+Factory.structs[:user]
+Factory[:user]
 ```

data/lib/rom/factory/attribute_registry.rb

@@ -18,14 +18,10 @@ module ROM
       end
 
       # @api private
-      def each(&block)
-        elements.each(&block)
-      end
+      def each(&) = elements.each(&)
 
       # @api private
-      def [](name)
-        detect { |e| e.name.equal?(name) }
-      end
+      def [](name) = detect { |e| e.name.equal?(name) }
 
       # @api private
       def <<(element)
@@ -36,30 +32,32 @@ module ROM
       end
 
       # @api private
-      def dup
-        self.class.new(elements.dup)
-      end
+      def dup = self.class.new(elements.dup)
 
       # @api private
-      def values
-        self.class.new(elements.select(&:value?))
-      end
+      def values = self.class.new(elements.select(&:value?))
 
       # @api private
       def associations
         self.class.new(elements.select { |e| e.is_a?(Attributes::Association::Core) })
       end
 
-      private
+      def reject(&) = self.class.new(elements.reject(&))
 
       # @api private
-      def tsort_each_node(&block)
-        each(&block)
+      def inspect
+        "#<#{self.class} #{elements.inspect}>"
       end
+      alias_method :to_s, :inspect
+
+      private
+
+      # @api private
+      def tsort_each_node(&) = each(&)
 
       # @api private
-      def tsort_each_child(attr, &block)
-        attr.dependency_names.map { |name| self[name] }.compact.each(&block)
+      def tsort_each_child(attr, &)
+        attr.dependency_names.map { |name| self[name] }.compact.each(&)
       end
     end
   end