vorpal 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2bd60707eb3762666ed0ada9c456b5d54fbc73ca5d56eda9febd1c540ffc754
-  data.tar.gz: a17bf33069fe5d44d2a9577da2d7e5457a18ab0703b7dfe14d67fc22f6f7d76c
+  metadata.gz: 6567d89919ba2836790c9d13fa729c43c21723fbcfa12ef8f77be2552e3f5df5
+  data.tar.gz: 3b5ebeea70138f7cf6e4e68c0e21d4024e3732c1cf6cbe1f04054a03fab815d0
 SHA512:
-  metadata.gz: 8a9b2b133c7db7523153b290d3422e84db785856a12d37d863608f017366dd0f06ddad3e4f9b261e28a6c7cd66a72dc54c52b05425715146165d7573118b84bc
-  data.tar.gz: da8970a533f9fce8e3cd3b3bcdd2464abd2b6c8fa0cb06fd8ced941d6c61115cea3df3523679a01722dcd7e641503628b76140bd553b0e167623021bd7e937fe
+  metadata.gz: 7f991b2d7a25ebf9d85bc7a2af59c02e7105ff981724372167e13e6a30ffcd4a9bfdcd7db5a886b22bbbd9c86e52065a69a9e8c072e805420d16b1cdb4ed0151
+  data.tar.gz: 5bdcb19c91b9ce1de724caa2231d86903e472d65ebd6a47a7fe39c705b31437b6b797e9a0df70c841251581ea882a5d0a33c1fdc236030fe951fc9bb1cf3c723

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+services:
+  - postgresql
+matrix:
+  include:
+    - rvm: 2.5.7
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: 2.7
+      gemfile: gemfiles/rails_6_0.gemfile
+cache:
+  - bundler
+script: "bundle exec rake"
+env:
+  - CODECOV_TOKEN="fab4ddb8-ba2c-47cb-a407-941209ad54a4"

data/Appraisals

@@ -1,34 +1,18 @@
-appraise "rails-4-1" do
-  ruby ">= 2.1.6"
-  gem "activerecord", "~> 4.1.0"
-  gem "pg", "~> 0.17.0"
-  gem "activerecord-import", "~> 0.10.0"
+appraise "rails-6-0" do
+  ruby ">= 2.7.0"
+  gem "activerecord", "~> 6.0.0"
 end
 
-appraise "rails-4-2" do
-  ruby ">= 2.1.6"
-  gem "activerecord", "~> 4.2.0"
-  gem "pg", "~> 0.17.0"
-  gem "activerecord-import", "~> 0.10.0"
-end
-
-appraise "rails-5-0" do
-  ruby ">= 2.2.2"
-  gem "activerecord", "~> 5.0.0"
+appraise "rails-5-2" do
+  ruby ">= 2.5.7"
+  gem "activerecord", "~> 5.2.0"
   gem "pg", "~> 0.18.0"
   gem "activerecord-import", "= 0.13.0"
 end
 
 appraise "rails-5-1" do
-  ruby ">= 2.2.2"
+  ruby ">= 2.5.7"
   gem "activerecord", "~> 5.1.0"
   gem "pg", "~> 0.18.0"
   gem "activerecord-import", "= 0.13.0"
 end
-
-appraise "rails-5-2" do
-  ruby ">= 2.2.2"
-  gem "activerecord", "~> 5.2.0"
-  gem "pg", "~> 0.18.0"
-  gem "activerecord-import", "= 0.13.0"
-end

data/README.md

@@ -1,16 +1,13 @@
-# Vorpal [![Build Status](https://travis-ci.org/nulogy/vorpal.svg?branch=master)](https://travis-ci.org/nulogy/vorpal) [![Code Climate](https://codeclimate.com/github/nulogy/vorpal/badges/gpa.svg)](https://codeclimate.com/github/nulogy/vorpal)
+# Vorpal [![Build Status](https://travis-ci.org/nulogy/vorpal.svg?branch=master)](https://travis-ci.org/nulogy/vorpal) [![Code Climate](https://codeclimate.com/github/nulogy/vorpal/badges/gpa.svg)](https://codeclimate.com/github/nulogy/vorpal) [![Code Coverage](https://codecov.io/gh/nulogy/vorpal/branch/master/graph/badge.svg)](https://codecov.io/gh/nulogy/vorpal/branch/master/graph/badge.svg)
 
 Separate your domain model from your persistence mechanism. Some problems call for a really sharp tool.
 
-
-> One, two! One, two! and through and through
-
-> The vorpal blade went snicker-snack!
-
-> He left it dead, and with its head
-
+> One, two! One, two! and through and through<br/>
+> The vorpal blade went snicker-snack!<br/>
+> He left it dead, and with its head<br/>
 > He went galumphing back.
 
+\- [Jabberwocky](https://www.poetryfoundation.org/poems/42916/jabberwocky) by Lewis Carroll
 
 ## Overview
 Vorpal is a [Data Mapper](http://martinfowler.com/eaaCatalog/dataMapper.html)-style ORM (object relational mapper) framelet that persists POROs (plain old Ruby objects) to a relational DB. It has been heavily influenced by concepts from [Domain Driven Design](http://www.infoq.com/minibooks/domain-driven-design-quickly).
@@ -143,7 +140,8 @@ module TreeRepository
 end
 ```
 
-Here we've used the `owned` flag on the `belongs_to` from the Tree to the Gardener to show that the Gardener is on the aggregate boundary.
+Here we've used the `owned: false` flag on the `belongs_to` from the Tree to the Gardener to show
+that the Gardener is on the aggregate boundary.
 
 And use it:
 
@@ -174,7 +172,7 @@ It also does not do some things that you might expect from other ORMs:
 1. No lazy loading of associations. This might sound like a big deal, but with [correctly designed aggregates](http://dddcommunity.org/library/vernon_2011/) it turns out not to be.
 1. No managing of transactions. It is the strong opinion of the authors that managing transactions is an application-level concern.
 1. No support for validations. Validations are not a persistence concern.
-1. No AR-style callbacks. Use Infrastructure, Application, or Domain [services](http://martinfowler.com/bliki/EvansClassification.html) instead.
+1. No AR-style callbacks. Use [Infrastructure, Application, or Domain services](http://martinfowler.com/bliki/EvansClassification.html) instead.
 1. No has-many-through associations. Use two has-many associations to a join entity instead.
 1. The `id` attribute is reserved for database primary keys. If you have a natural key/id on your domain model, name it something that makes sense for your domain. It is the strong opinion of the authors that using natural keys as foreign keys is a bad idea. This mixes domain and persistence concerns.
 
@@ -239,33 +237,31 @@ For example:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
-### Setup DirEnv
-
-Using this gem's bin stubs (contained in the `bin` dir) is much easier if [DirEnv](https://github.com/direnv/direnv) is installed.
-
-On OSX using ZSH DirEnv can be installed like so:
-
-1. `brew install direnv`
-2. `echo 'eval "$(direnv hook zsh)"' >> ~/.zshrc`
+## OSX Environment setup
 
-Please see the [DirEnv docs](https://direnv.net/) if your environment is different.
+1. Install [Homebrew](https://brew.sh/)
+2. Install [rbenv](https://github.com/rbenv/rbenv#installation) ([RVM](https://rvm.io/) can work too)
+3. Install [DirEnv](https://direnv.net/docs/installation.html) (`brew install direnv`)
+4. Install Docker Desktop Community Edition (`brew cask install docker`)
+5. Start Docker Desktop Community Edition (`CMD+space docker ENTER`)
+6. Install Ruby (`rbenv install 2.7.0`)
+7. Install PostgreSQL (`brew install postgresql`)
+8. Clone the repo (`git clone git@github.com:nulogy/vorpal.git`) and `cd` to the project root.
+8. Copy the contents of `gemfiles/rails_<version>.gemfile.lock` into a `Gemfile.lock` file
+  at the root of the project. (`cp gemfiles/rails_6_0.gemfile.lock gemfile.lock`)
+9. `bundle`
 
 ### Running Tests
 
-1. Start a PostgreSQL server.
-2. Either:
-  * Create a DB user called `vorpal` with password `pass`. OR:
-  * Modify `spec/helpers/db_helpers.rb`.
-3. Run `rake` from the terminal.
+1. Start a PostgreSQL server using `docker-compose up`
+3. Run `rake` from the terminal to run all specs or `rspec <path to spec file>` to
+  run a single spec.
 
-### Running Tests for the non-default versions of Rails
+### Running Tests for a specific version of Rails
 
-1. Start a PostgreSQL server.
-2. Either:
-  * Create a DB user called `vorpal` with password `pass`. OR:
-  * Modify `spec/helpers/db_helpers.rb`.
-3. Run `appraisal <rails version> rake` from the terminal.
-  * Where `<rails version>` is one of the options defined in the `./Appraisal` file.
+1. Start a PostgreSQL server using `docker-compose up`
+2. Run `appraisal rails-5-2 rake` from the terminal to run all specs or
+  `appraisal rails-5-2 rspec <path to spec file>` to run a single spec.
 
 Please see the [Appraisal gem docs](https://github.com/thoughtbot/appraisal) for more information.
 

data/Rakefile

@@ -5,6 +5,35 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks associated with creating new versions of the gem.'
 end
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+begin
+  require 'rspec/core/rake_task'
+
+  namespace :spec do
+    RSpec::Core::RakeTask.new(:acceptance) do |t|
+      t.pattern = "spec/acceptance/**/*_spec.rb"
+    end
+
+    RSpec::Core::RakeTask.new(:integration) do |t|
+      t.pattern = "spec/integration/**/*_spec.rb"
+    end
+
+    RSpec::Core::RakeTask.new(:performance) do |t|
+      t.pattern = "spec/performance/**/*_spec.rb"
+    end
+
+    RSpec::Core::RakeTask.new(:unit) do |t|
+      t.pattern = "spec/unit/**/*_spec.rb"
+    end
+
+    desc "Run all non-performance related specs"
+    task non_perf: [:unit, :integration, :acceptance]
+
+    desc "Run all specs"
+    task all: [:acceptance, :integration, :unit, :performance]
+  end
+
+  task default: :'spec:all'
+rescue LoadError
+  # Allow the Rakefile to be used in environments where the RSpec gem is unavailable
+  # (e.g. Production)
+end

data/docker-compose.yml

@@ -0,0 +1,19 @@
+version: "3.6"
+
+services:
+  vorpal_postgres:
+    hostname: vorpal_postgres
+    command: -p 55433
+    image: postgres:11.4
+    ports:
+      - "55433:55433"
+    volumes:
+      - vorpal_postgres_volume:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: vorpal
+      POSTGRES_PASSWORD: pass
+      POSTGRES_DB: vorpal_development
+    restart: unless-stopped
+
+volumes:
+  vorpal_postgres_volume:

data/gemfiles/rails_5_1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby ">= 2.2.2"
+ruby ">= 2.5.7"
 
 gem "activerecord", "~> 5.1.0"
 gem "pg", "~> 0.18.0"

data/gemfiles/rails_5_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    vorpal (1.0.0)
+    vorpal (1.0.1)
       activesupport
       equalizer
       simple_serializer (~> 1.0)
@@ -9,15 +9,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
     activerecord-import (0.13.0)
       activerecord (>= 3.0)
-    activesupport (5.1.6)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -31,17 +31,23 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    codecov (0.1.16)
+      json
+      simplecov
+      url
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
+    docile (1.3.2)
     equalizer (0.0.11)
-    i18n (1.1.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    minitest (5.11.3)
+    json (2.3.0)
+    minitest (5.14.0)
     pg (0.18.4)
     rake (10.5.0)
     rspec (3.8.0)
@@ -58,10 +64,16 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     simple_serializer (1.0.2)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    url (0.3.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -75,14 +87,15 @@ DEPENDENCIES
   activerecord (~> 5.1.0)
   activerecord-import (= 0.13.0)
   appraisal (~> 2.2)
+  codecov
   pg (~> 0.18.0)
-  rake (~> 10.0)
+  rake (~> 10)
   rspec (~> 3.0)
   virtus (~> 1.0)
   vorpal!
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.6.3p62
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/gemfiles/rails_5_2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby ">= 2.2.2"
+ruby ">= 2.5.7"
 
 gem "activerecord", "~> 5.2.0"
 gem "pg", "~> 0.18.0"

data/gemfiles/rails_5_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    vorpal (1.0.0)
+    vorpal (1.0.1)
       activesupport
       equalizer
       simple_serializer (~> 1.0)
@@ -9,15 +9,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activerecord (5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       arel (>= 9.0)
     activerecord-import (0.13.0)
       activerecord (>= 3.0)
-    activesupport (5.2.1)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -31,17 +31,23 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    codecov (0.1.16)
+      json
+      simplecov
+      url
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
+    docile (1.3.2)
     equalizer (0.0.11)
-    i18n (1.1.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    minitest (5.11.3)
+    json (2.3.0)
+    minitest (5.14.0)
     pg (0.18.4)
     rake (10.5.0)
     rspec (3.8.0)
@@ -58,10 +64,16 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     simple_serializer (1.0.2)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    url (0.3.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -75,14 +87,15 @@ DEPENDENCIES
   activerecord (~> 5.2.0)
   activerecord-import (= 0.13.0)
   appraisal (~> 2.2)
+  codecov
   pg (~> 0.18.0)
-  rake (~> 10.0)
+  rake (~> 10)
   rspec (~> 3.0)
   virtus (~> 1.0)
   vorpal!
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.6.3p62
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+ruby ">= 2.7.0"
+
+gem "activerecord", "~> 6.0.0"
+
+gemspec path: "../"

data/gemfiles/{rails_5_0.gemfile.lock → rails_6_0.gemfile.lock}

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    vorpal (1.0.0)
+    vorpal (1.0.1)
       activesupport
       equalizer
       simple_serializer (~> 1.0)
@@ -9,80 +9,93 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.7)
-      activesupport (= 5.0.7)
-    activerecord (5.0.7)
-      activemodel (= 5.0.7)
-      activesupport (= 5.0.7)
-      arel (~> 7.0)
-    activerecord-import (0.13.0)
-      activerecord (>= 3.0)
-    activesupport (5.0.7)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord-import (1.0.4)
+      activerecord (>= 3.2)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (7.1.4)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    codecov (0.1.16)
+      json
+      simplecov
+      url
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
+    docile (1.3.2)
     equalizer (0.0.11)
-    i18n (1.1.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    minitest (5.11.3)
-    pg (0.18.4)
+    json (2.3.0)
+    minitest (5.14.0)
+    pg (1.2.2)
     rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     simple_serializer (1.0.2)
-    thor (0.20.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    url (0.3.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.0.0)
-  activerecord-import (= 0.13.0)
+  activerecord (~> 6.0.0)
+  activerecord-import
   appraisal (~> 2.2)
-  pg (~> 0.18.0)
-  rake (~> 10.0)
+  codecov
+  pg
+  rake (~> 10)
   rspec (~> 3.0)
   virtus (~> 1.0)
   vorpal!
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.7.0p0
 
 BUNDLED WITH
-   1.16.2
+   2.1.4