rom-factory 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f2cad99dc93108f4bb7e9ac571ed198eaedee1b541b886fc018bb4501360817
-  data.tar.gz: 7fde94283a3d31672b6fa3ea8c082320524dc106025d4f50ac64ab3005bda6c7
+  metadata.gz: d518c3e2f7f686c9366ef1c54ba7a2c33d1858fd3507dde56b49a1f1e9c49efd
+  data.tar.gz: 7fdf505e789b85006f9dd639b1bc15b1ed76a2129144dd965494ab0853693ffa
 SHA512:
-  metadata.gz: 8d14003a058a9eda9b2a407be0d4571de6213ded73532a01a0dbee8bdb3de47836a517425a742cf117b8674b67b64bf00d7e2ac9f47887f110a05d8143d7e0be
-  data.tar.gz: 389317084e6d7331c8e1fafcd304f34c458e393a63aee70debf0e04bd78d026b005a5f5ff5678eb3be29e499fdb2f1052b27a3602c31232d8ca14588cd506bfa
+  metadata.gz: 90d96b038566692c001c2eabdee291276ec604910db01343b912d4c56690a6564278183f1315d87d6de42dc7716a4a3f26518dcff6f1ffcad1f3301f1553a737
+  data.tar.gz: 2ea5c2473d2a35b109978079f8ac71c3ea375b19643b787bc0c71b9549b03cfb3e09173fb33b30b1465ff85defabe588a075fc4e6857040d77fdc59fec9c04fe

data/.codeclimate.yml

@@ -1,6 +1,19 @@
-engines:
+version: "2"
+
+prepare:
+  fetch:
+  - url: "https://raw.githubusercontent.com/rom-rb/devtools/master/.rubocop.yml"
+    path: ".rubocop.yml"
+
+exclude_patterns:
+  - "benchmarks/"
+  - "examples/"
+  - "spec/"
+  - "*/spec/"
+  - "*/examples/"
+  - "*/benchmarks/"
+  - "!*.rb"
+
+plugins:
   rubocop:
     enabled: true
-ratings:
-  paths:
-    - lib/**

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

@@ -0,0 +1,10 @@
+---
+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

@@ -0,0 +1,10 @@
+---
+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

@@ -0,0 +1,30 @@
+---
+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/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.rubocop.yml

data/.travis.yml

@@ -1,19 +1,20 @@
 language: ruby
-sudo: false
+
 services:
   - postgresql
   - mysql
 bundler_args: --without tools benchmarks
+before_install:
+  - gem install bundler
 before_script:
   - psql -c 'create database rom_factory;' -U postgres
-script: "bundle exec rake spec"
 after_success:
   - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
 rvm:
-  - 2.5.0
-  - 2.4.2
-  - 2.3.6
-  - jruby-9.1.13.0
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
+  - jruby-9.2.6.0
 env:
   global:
     - COVERAGE='true'

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.8.0 to-be-released
+
+### Fixed
+
+* Loaded association structs are no longer rejected by output schemas (issue #34) (flash-gordon + solnic)
+
+[Compare v0.7.0...v0.8.0](https://github.com/rom-rb/rom-factory/compare/v0.7.0...v0.8.0)
+
 ## 0.7.0 2018-11-17
 
 ### Added

data/Gemfile

@@ -1,24 +1,27 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.0'
 
 group :test do
-  gem 'rom-sql', '~> 2.1'
-  gem 'rom-core', '~> 4.2', '>= 4.2.1'
+  gem 'rom-sql', '~> 3.0'
   gem 'inflecto'
   gem 'pry-byebug', platforms: :mri
   gem 'pry', platforms: :jruby
   gem 'codeclimate-test-reporter'
   gem 'simplecov'
 
-  gem 'pg', '~> 0.21', platforms: :mri
-  gem 'mysql2', platforms: :mri
+  gem 'pg', '~> 0.21', platforms: [:mri, :truffleruby]
+  gem 'mysql2', platforms: [:mri, :truffleruby]
   gem 'jdbc-postgres', platforms: :jruby
   gem 'jdbc-mysql', platforms: :jruby
-  gem 'sqlite3', '~> 1.3', platforms: :mri
+  gem 'sqlite3', '~> 1.3', platforms: [:mri, :truffleruby]
   gem 'jdbc-sqlite3', platforms: :jruby
 end
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/benchmarks/basic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom-factory'
 require 'rom-core'
 require 'active_record'
@@ -23,9 +25,9 @@ end
 factory = ROM::Factory.configure { |c| c.rom = rom }
 
 factory.define(:user) do |f|
-  f.first_name "John"
-  f.last_name "Doe"
-  f.admin false
+  f.first_name { "John" }
+  f.last_name { "Doe" }
+  f.admin { false }
 end
 
 class User < ActiveRecord::Base
@@ -35,35 +37,29 @@ ActiveRecord::Base.establish_connection(DATABASE_URL)
 
 FactoryBot.define do
   factory(:user) do
-    first_name "John"
-    last_name  "Doe"
-    admin false
+    first_name { "John" }
+    last_name  { "Doe" }
+    admin { false }
   end
 end
 
 Fabricator(:user) do
-  first_name "John"
-  last_name  "Doe"
-  admin false
+  first_name { "John" }
+  last_name  { "Doe" }
+  admin { false }
 end
 
 Benchmark.ips do |x|
   x.report('rom-factory persisted struct') do
-    1000.times do
-      factory[:user]
-    end
+    factory[:user]
   end
 
   x.report('factory_bot') do
-    1000.times do
-      FactoryBot.create(:user)
-    end
+    FactoryBot.create(:user)
   end
 
   x.report('fabrication') do
-    1000.times do
-      Fabricate(:user)
-    end
+    Fabricate(:user)
   end
 
   x.compare!

data/lib/rom-factory.rb

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

data/lib/rom/factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/core/class_builder'
 require 'rom/factory/factories'
 

data/lib/rom/factory/attribute_registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tsort'
 
 module ROM

data/lib/rom/factory/attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/core/constants'
 
 module ROM

data/lib/rom/factory/attributes/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM::Factory
   module Attributes
     # @api private

data/lib/rom/factory/attributes/callable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM::Factory
   module Attributes
     # @api private

data/lib/rom/factory/attributes/sequence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM::Factory
   module Attributes
     class Sequence

data/lib/rom/factory/attributes/value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM::Factory
   module Attributes
     # @api private

data/lib/rom/factory/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/core/constants'
 
 require 'rom/struct'

data/lib/rom/factory/builder/persistable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 
 module ROM

data/lib/rom/factory/constants.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module Factory
     class FactoryNotDefinedError < StandardError

data/lib/rom/factory/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faker'
 require 'dry/core/inflector'
 

data/lib/rom/factory/factories.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/configurable'
 require 'dry/core/inflector'
 

data/lib/rom/factory/registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/factory/constants'
 
 module ROM

data/lib/rom/factory/sequences.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 
 module ROM

data/lib/rom/factory/tuple_evaluator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/factory/sequences'
 
 module ROM
@@ -47,7 +49,14 @@ module ROM
         end
 
         attributes.merge!(materialized_callables)
-        attributes = relation.output_schema.call(attributes)
+
+        associations = assoc_names
+          .map { |key| [key, attributes[key]] if attributes.key?(key) }
+          .compact
+          .to_h
+
+        attributes = relation.output_schema[attributes]
+        attributes.update(associations)
 
         model.new(attributes)
       end

data/lib/rom/factory/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ROM
   module Factory
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.8.0'
   end
 end

data/rom-factory.gemspec

@@ -1,4 +1,6 @@
 # coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rom/factory/version'
@@ -28,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dry-configurable", "~> 0.7"
-  spec.add_dependency "dry-core", "~> 0.3", ">= 0.3.1"
-  spec.add_dependency "rom-core", "~> 4.0"
+  spec.add_dependency "dry-core", "~> 0.4"
+  spec.add_dependency "rom-core", "~> 5.0"
   spec.add_dependency "faker", "~> 1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rom-factory
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Janis Miezitis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -31,34 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rom-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +76,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".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"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -131,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ROM based builder library to make your specs awesome. DSL partially inspired