Introduces Hanami::Relation

.circleci/config.yml

@@ -58,7 +58,8 @@ jobs:
       - run:
           name: install MySQL client
           command: |
-            sudo apt install -y mysql-client
+            sudo apt-get update
+            sudo apt install -y default-mysql-client
       - run:
           name: install dependencies
           command: |
@@ -100,7 +101,7 @@ jobs:
           name: install PostgreSQL client
           command: |
             wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | sudo apt-key add -
-            sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
+            sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
             sudo apt-get update
             sudo apt install -y postgresql-contrib
       - run:

.drone.yml

@@ -177,186 +177,6 @@ services:
     POSTGRES_USER: postgres
     POSTGRES_DB: hanami_model
 
----
-kind: pipeline
-name: ruby-2-4
-group: build
-
-steps:
-- name: install
-  image: hanami/ruby-2.4-db
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  commands:
-  - ruby -v
-  - gem install bundler
-  - bundle install --jobs=3 --retry=3
-
-- name: unit-sqlite3
-  image: hanami/ruby-2.4-db
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  environment:
-    DB: sqlite3
-    DRONE: true
-  commands:
-  - COVERAGE=true bundle exec rake
-
-- name: unit-mysql
-  image: hanami/ruby-2.4-db
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  environment:
-    DB: mysql
-    HANAMI_DATABASE_USERNAME: root
-    HANAMI_DATABASE_PASSWORD:
-    HANAMI_DATABASE_HOST: mysql-server # see below: services -> name
-  commands:
-  - mysql -u $HANAMI_DATABASE_USERNAME -h $HANAMI_DATABASE_HOST --execute="SELECT VERSION();" # assert can connect to database
-  - COVERAGE=true bundle exec rake
-
-- name: unit-postgres
-  image: hanami/ruby-2.4-db
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  environment:
-    DB: postgres
-    HANAMI_DATABASE: hanami_model
-    HANAMI_DATABASE_USERNAME: postgres
-    HANAMI_DATABASE_PASSWORD:
-    HANAMI_DATABASE_HOST: postgres-server # see below: services -> name
-  commands:
-  - psql -U $HANAMI_DATABASE_USERNAME -d $HANAMI_DATABASE -h $HANAMI_DATABASE_HOST # assert can connect to database
-  - COVERAGE=true bundle exec rake
-
-- name: quality
-  image: hanami/ruby-2.4-db
-  environment:
-    CODECOV_TOKEN:
-      from_secret: codecov
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  commands:
-  - bundle exec rubocop
-  - CI=true bundle exec rake codecov:upload
-
-volumes:
-- name: bundle
-  temp: {}
-
-services:
-- name: mysql-server
-  image: mysql
-  ports:
-  - 3306
-  environment:
-    MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-    MYSQL_DATABASE: hanami_model
-  command: ["--default-authentication-plugin=mysql_native_password"]
-
-- name: postgres-server
-  image: postgres:11-alpine
-  ports:
-  - 5432
-  environment:
-    POSTGRES_USER: postgres
-    POSTGRES_DB: hanami_model
-
----
-kind: pipeline
-name: ruby-2-3
-group: build
-
-steps:
-- name: install
-  image: hanami/ruby-2.3-db
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  commands:
-  - ruby -v
-  - gem install bundler
-  - bundle install --jobs=3 --retry=3
-
-- name: unit-sqlite3
-  image: hanami/ruby-2.3-db
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  environment:
-    DB: sqlite3
-    DRONE: true
-  commands:
-  - COVERAGE=true bundle exec rake
-
-- name: unit-mysql
-  image: hanami/ruby-2.3-db
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  environment:
-    DB: mysql
-    HANAMI_DATABASE_USERNAME: root
-    HANAMI_DATABASE_PASSWORD:
-    HANAMI_DATABASE_HOST: mysql-server # see below: services -> name
-  commands:
-  - mysql -u $HANAMI_DATABASE_USERNAME -h $HANAMI_DATABASE_HOST --execute="SELECT VERSION();" # assert can connect to database
-  - COVERAGE=true bundle exec rake
-
-- name: unit-postgres
-  image: hanami/ruby-2.3-db
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  environment:
-    DB: postgres
-    HANAMI_DATABASE: hanami_model
-    HANAMI_DATABASE_USERNAME: postgres
-    HANAMI_DATABASE_PASSWORD:
-    HANAMI_DATABASE_HOST: postgres-server # see below: services -> name
-  commands:
-  - psql -U $HANAMI_DATABASE_USERNAME -d $HANAMI_DATABASE -h $HANAMI_DATABASE_HOST # assert can connect to database
-  - COVERAGE=true bundle exec rake
-
-- name: quality
-  image: hanami/ruby-2.3-db
-  environment:
-    CODECOV_TOKEN:
-      from_secret: codecov
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  commands:
-  - bundle exec rubocop
-  - CI=true bundle exec rake codecov:upload
-
-volumes:
-- name: bundle
-  temp: {}
-
-services:
-- name: mysql-server
-  image: mysql
-  ports:
-  - 3306
-  environment:
-    MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-    MYSQL_DATABASE: hanami_model
-  command: ["--default-authentication-plugin=mysql_native_password"]
-
-- name: postgres-server
-  image: postgres:11-alpine
-  ports:
-  - 5432
-  environment:
-    POSTGRES_USER: postgres
-    POSTGRES_DB: hanami_model
-
 ---
 kind: pipeline
 name: slack
@@ -366,7 +186,7 @@ clone:
   disable: true
 
 depends_on:
-  - ruby-2-3
+  - ruby-2-5
 
 steps:
 - name: slack

.rubocop.yml

@@ -1,7 +1,7 @@
 # Please keep AllCops, Bundler, Style, Metrics groups and then order cops
 # alphabetically
 inherit_from:
-  - https://raw.githubusercontent.com/hanami/devtools/master/.rubocop.yml
+  - https://raw.githubusercontent.com/hanami/devtools/master/.rubocop-unstable.yml
 Naming/RescuedExceptionsVariableName:
   PreferredName: "exception"
 Style/RescueStandardError:

.travis.yml

@@ -4,13 +4,9 @@ cache: bundler
 script: 'bundle exec rubocop && bundle exec rake spec:unit --trace'
 after_script: 'echo `env`'
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
-  - jruby-9.1.9.0
+  - 2.5
+  - 2.6
   - ruby-head
-  - jruby-head
 env:
   - DB=sqlite
   - DB=postgresql
@@ -22,8 +18,7 @@ addons:
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: jruby-9.1.9.0
+    - env: DB=mysql
 
 notifications:
   webhooks:

Gemfile

@@ -1,19 +1,21 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 gemspec
 
-unless ENV['CI']
-  gem 'byebug', require: false, platforms: :mri
-  gem 'yard',   require: false
+unless ENV["CI"]
+  gem "byebug", require: false, platforms: :mri
+  gem "yard",   require: false
 end
 
-gem 'hanami-utils', '~> 1.3', require: false, git: 'https://github.com/hanami/utils.git', branch: 'master'
+gem "hanami-utils", "~> 2.0.alpha", require: false, git: "https://github.com/hanami/utils.git", branch: "unstable"
 
-gem 'sqlite3', require: false, platforms: :mri, group: :sqlite
-gem 'pg',      require: false, platforms: :mri, group: :postgres
-gem 'mysql2',  require: false, platforms: :mri, group: :mysql
+gem "sqlite3", require: false, platforms: :mri, group: :sqlite
+gem "pg",      require: false, platforms: :mri, group: :postgres
+gem "mysql2",  require: false, platforms: :mri, group: :mysql
 
-gem 'jdbc-sqlite3',  require: false, platforms: :jruby, group: :sqlite
-gem 'jdbc-postgres', require: false, platforms: :jruby, group: :postgres
-gem 'jdbc-mysql',    require: false, platforms: :jruby, group: :mysql
+gem "jdbc-sqlite3",  require: false, platforms: :jruby, group: :sqlite
+gem "jdbc-postgres", require: false, platforms: :jruby, group: :postgres
+gem "jdbc-mysql",    require: false, platforms: :jruby, group: :mysql
 
-gem 'hanami-devtools', require: false, git: 'https://github.com/hanami/devtools.git'
+gem "hanami-devtools", require: false, git: "https://github.com/hanami/devtools.git"

README.md

@@ -32,7 +32,7 @@ Like all the other Hanami components, it can be used as a standalone framework o
 
 ## Rubies
 
-__Hanami::Model__ supports Ruby (MRI) 2.3+ and JRuby 9.1.5.0+
+__Hanami::Model__ supports Ruby (MRI) 2.5+
 
 ## Installation
 
@@ -295,6 +295,6 @@ __Hanami::Model__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Copyright © 2014-2017 Luca Guidi – Released under MIT License
+Copyright © 2014-2019 Luca Guidi – Released under MIT License
 
 This project was formerly known as Lotus (`lotus-model`).

Rakefile

@@ -1,12 +1,14 @@
-require 'rake'
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'hanami/devtools/rake_tasks'
+# frozen_string_literal: true
+
+require "rake"
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "hanami/devtools/rake_tasks"
 
 namespace :spec do
   RSpec::Core::RakeTask.new(:unit) do |task|
-    task.pattern = FileList['spec/**/*_spec.rb']
+    task.pattern = FileList["spec/**/*_spec.rb"]
   end
 end
 
-task default: 'spec:unit'
+task default: "spec:unit"

hanami-model.gemspec

@@ -1,32 +1,34 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hanami/model/version'
+require "hanami/model/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'hanami-model'
+  spec.name          = "hanami-model"
   spec.version       = Hanami::Model::VERSION
-  spec.authors       = ['Luca Guidi']
-  spec.email         = ['me@lucaguidi.com']
-  spec.summary       = 'A persistence layer for Hanami'
-  spec.description   = 'A persistence framework with entities and repositories'
-  spec.homepage      = 'http://hanamirb.org'
-  spec.license       = 'MIT'
+  spec.authors       = ["Luca Guidi"]
+  spec.email         = ["me@lucaguidi.com"]
+  spec.summary       = "A persistence layer for Hanami"
+  spec.description   = "A persistence framework with entities and repositories"
+  spec.homepage      = "http://hanamirb.org"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z -- lib/* CHANGELOG.md EXAMPLE.md LICENSE.md README.md hanami-model.gemspec`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_runtime_dependency 'hanami-utils',    '~> 1.3'
-  spec.add_runtime_dependency 'rom',             '~> 3.3', '>= 3.3.3'
-  spec.add_runtime_dependency 'rom-sql',         '~> 1.3', '>= 1.3.5'
-  spec.add_runtime_dependency 'rom-repository',  '~> 1.4'
-  spec.add_runtime_dependency 'dry-types',       '~> 0.11.0'
-  spec.add_runtime_dependency 'dry-logic',       '~> 0.4.2', '< 0.5'
-  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
+  spec.add_runtime_dependency "hanami-utils",    "~> 2.0.alpha"
+  spec.add_runtime_dependency "rom",             "~> 5.2"
+  spec.add_runtime_dependency "rom-repository",  "~> 5.2"
+  spec.add_runtime_dependency "rom-sql",         "~> 3.2"
+  spec.add_runtime_dependency "dry-types",       "~> 1.3"
+  spec.add_runtime_dependency "dry-inflector",   "~> 0.1"
+  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
 
-  spec.add_development_dependency 'bundler', '>= 1.6', '< 3'
-  spec.add_development_dependency 'rake',  '~> 12'
-  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency "bundler", ">= 1.6", "< 3"
+  spec.add_development_dependency "rake",  "~> 12"
+  spec.add_development_dependency "rspec", "~> 3.8"
 end