diff --git a/.codeclimate.yml b/.codeclimate.yml
index 7897fff..0ea604d 100755
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,5 +1,6 @@
 ---
-engines:
+version: 2
+plugins:
   duplication:
     enabled: true
     config:
@@ -9,9 +10,7 @@ engines:
     enabled: true
   rubocop:
     enabled: true
-ratings:
-  paths:
-  - '**.rb'
-exclude_paths:
+    channel: rubocop-0-54
+exclude_patterns:
 - script/
 - spec/
diff --git a/.gem_release.yml b/.gem_release.yml
new file mode 100644
index 0000000..fd644dd
--- /dev/null
+++ b/.gem_release.yml
@@ -0,0 +1,3 @@
+---
+bump:
+  file: ./lib/machinist/version.rb
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..4bfa34e
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,16 @@
+dependency_scanning:
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
+  artifacts:
+    paths: [gl-dependency-scanning-report.json]
diff --git a/.rubocop b/.rubocop
new file mode 100644
index 0000000..71b4480
--- /dev/null
+++ b/.rubocop
@@ -0,0 +1 @@
+--extra-details
diff --git a/.rubocop.yml b/.rubocop.yml
index 6fe558b..64532fd 100755
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,44 +6,41 @@ AllCops:
   TargetRubyVersion: 2.2
   DisplayCopNames: true
   Exclude:
-    - 'tmp/**/*'
+    - gemfiles/**/*
+    - tmp/**/*
 
-Style/MixinGrouping:
-  Exclude:
-    - 'spec/**/*.rb'
+Layout/DotPosition:
+  EnforcedStyle: leading
+  Enabled: true
+
+Layout/ExtraSpacing:
+  Enabled: true
+
+Lint/LiteralInInterpolation:
+  AutoCorrect: true
 
 Metrics/BlockLength:
   CountComments: false  # count full line comments?
   Exclude:
     - '**/*_spec.rb'
 
-StringLiterals:
-  EnforcedStyle: single_quotes
+Metrics/LineLength:
+  Max: 120
   Enabled: true
 
-DotPosition:
-  EnforcedStyle: leading
+Naming/FileName:
   Enabled: true
 
-ClassAndModuleChildren:
+Style/ClassAndModuleChildren:
   EnforcedStyle: nested
   Enabled: true
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
-FileName:
-  Enabled: true
-
-LineLength:
-  Max: 120
-  Enabled: true
-
-Style/ExtraSpacing:
-  Enabled: true
-
-Lint/LiteralInInterpolation:
-  AutoCorrect: true
+Style/MixinGrouping:
+  Exclude:
+    - spec/**/*.rb
 
 Style/ModuleFunction:
   EnforcedStyle: extend_self # Allows us to have private methods too
@@ -58,3 +55,7 @@ Style/PercentLiteralDelimiters:
     '%r': '{}'
     '%w': '[]'
     '%W': '[]'
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+  Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index be2bcca..45eadf4 100755
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,27 +1,28 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-05-16 15:42:20 +0100 using RuboCop version 0.48.1.
+# on 2018-05-29 13:23:58 +0100 using RuboCop version 0.54.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-Metrics/AbcSize:
-  Max: 17
-
-# Offense count: 1
-Metrics/CyclomaticComplexity:
-  Max: 7
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 13
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/machinist/blueprint.rb'
 
-# Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 8
+# Offense count: 4
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/machinist/active_record_spec.rb'
 
 # Offense count: 1
 RSpec/DescribeMethod:
@@ -44,18 +45,26 @@ RSpec/IteratedExpectation:
     - 'spec/machinist/machinable_spec.rb'
 
 # Offense count: 21
+# Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 6
 
 # Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Style/FileName:
+# Cop supports --auto-correct.
+Style/Encoding:
+  Exclude:
+    - 'machinist.gemspec'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
   Exclude:
-    - 'Appraisals'
+    - 'lib/generators/machinist/install/install_generator.rb'
+    - 'machinist.gemspec'
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
   Exclude:
@@ -68,17 +77,14 @@ Style/GuardClause:
     - 'lib/generators/machinist/install/install_generator.rb'
     - 'lib/machinist/lathe.rb'
 
-# Offense count: 1
-Style/MethodMissing:
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
   Exclude:
+    - 'lib/generators/machinist/install/install_generator.rb'
     - 'lib/machinist/lathe.rb'
 
 # Offense count: 1
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
+Style/MethodMissing:
   Exclude:
-    - 'spec/**/*'
-    - 'lib/machinist/blueprint.rb'
+    - 'lib/machinist/lathe.rb'
diff --git a/.travis.yml b/.travis.yml
index b90ec3a..42c97d4 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: ruby
 
 rvm:
   - ruby-head
+  - 2.5.1
   - 2.4.1
   - 2.3.4
   - 2.2.6
@@ -11,6 +12,7 @@ gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
 
 matrix:
   allow_failures:
diff --git a/Appraisals b/Appraisals
index f76d745..f58ea9b 100755
--- a/Appraisals
+++ b/Appraisals
@@ -1,11 +1,15 @@
 appraise 'rails-4.2' do
-  gem 'activerecord', '~> 4.2.8', group: :test, require: false
+  gem 'activerecord', '~> 4.2.10', group: :test, require: false
 end
 
 appraise 'rails-5.0' do
-  gem 'activerecord', '~> 5.0.3', group: :test, require: false
+  gem 'activerecord', '~> 5.0.7', group: :test, require: false
 end
 
 appraise 'rails-5.1' do
-  gem 'activerecord', '~> 5.1.1', group: :test, require: false
+  gem 'activerecord', '~> 5.1.6', group: :test, require: false
+end
+
+appraise 'rails-5.2' do
+  gem 'activerecord', '~> 5.2.0', group: :test, require: false
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..6618503
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,57 @@
+# Change Log
+
+## [Unreleased](https://github.com/dominicsayers/machinist/tree/HEAD)
+
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v3.0.3...HEAD)
+
+**Merged pull requests:**
+
+- add rails 5.2 tests [\#5](https://github.com/dominicsayers/machinist/pull/5) ([thomasdziedzic-pd](https://github.com/thomasdziedzic-pd))
+
+## [v3.0.3](https://github.com/dominicsayers/machinist/tree/v3.0.3) (2017-05-19)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v3.0.2...v3.0.3)
+
+## [v3.0.2](https://github.com/dominicsayers/machinist/tree/v3.0.2) (2017-05-19)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v3.0.1...v3.0.2)
+
+**Closed issues:**
+
+- Better diagnostics when ActiveRecord model can't be instantiated [\#4](https://github.com/dominicsayers/machinist/issues/4)
+
+**Merged pull requests:**
+
+- Machinist v3 [\#3](https://github.com/dominicsayers/machinist/pull/3) ([dominicsayers](https://github.com/dominicsayers))
+
+## [v3.0.1](https://github.com/dominicsayers/machinist/tree/v3.0.1) (2017-05-17)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v3.0.0...v3.0.1)
+
+## [v3.0.0](https://github.com/dominicsayers/machinist/tree/v3.0.0) (2017-05-17)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v2.0...v3.0.0)
+
+**Merged pull requests:**
+
+- Development environment [\#2](https://github.com/dominicsayers/machinist/pull/2) ([dominicsayers](https://github.com/dominicsayers))
+- Rails 4.2 [\#1](https://github.com/dominicsayers/machinist/pull/1) ([dominicsayers](https://github.com/dominicsayers))
+
+## [v2.0](https://github.com/dominicsayers/machinist/tree/v2.0) (2012-01-13)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v2.0.0.beta2...v2.0)
+
+## [v2.0.0.beta2](https://github.com/dominicsayers/machinist/tree/v2.0.0.beta2) (2010-07-06)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v2.0.0.beta1...v2.0.0.beta2)
+
+## [v2.0.0.beta1](https://github.com/dominicsayers/machinist/tree/v2.0.0.beta1) (2010-07-06)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/v1.0.6...v2.0.0.beta1)
+
+## [v1.0.6](https://github.com/dominicsayers/machinist/tree/v1.0.6) (2009-11-29)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/1.0.5...v1.0.6)
+
+## [1.0.5](https://github.com/dominicsayers/machinist/tree/1.0.5) (2009-10-20)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/1.0.4...1.0.5)
+
+## [1.0.4](https://github.com/dominicsayers/machinist/tree/1.0.4) (2009-10-08)
+[Full Changelog](https://github.com/dominicsayers/machinist/compare/1.0.0...1.0.4)
+
+## [1.0.0](https://github.com/dominicsayers/machinist/tree/1.0.0) (2009-06-02)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 83eabce..2535d79 100755
--- a/Gemfile
+++ b/Gemfile
@@ -6,13 +6,14 @@ gem 'sqlite3'
 
 group :development do
   gem 'appraisal', require: false
-  gem 'gem-release', require: false
+  gem 'gem-release', '> 1', require: false
   gem 'github_changelog_generator', require: false
   gem 'guard', require: false
   gem 'guard-rspec', require: false
   gem 'guard-rubocop', require: false
   gem 'guard-rubycritic', require: false
   gem 'rdoc', require: false
+  gem 'rubocop', '= 0.54', require: false
   gem 'rubocop-rspec', require: false
 end
 
diff --git a/README.md b/README.md
index 59b7149..364aa73 100755
--- a/README.md
+++ b/README.md
@@ -3,11 +3,11 @@
 *Fixtures aren't fun. Machinist was.*
 
 [![Gem version](https://badge.fury.io/rb/machinist_redux.svg)](https://rubygems.org/gems/machinist_redux)
-[![Gem downloads](https://img.shields.io/gem/dt/machinist_redux.svg)](https://rubygems.org/gems/machinist_redux)
+[![Gem downloads](https://img.shields.io/gem/dt/machinist_redux.svg?style=flat-square)](https://rubygems.org/gems/machinist_redux)
 [![Build Status](https://travis-ci.org/dominicsayers/machinist.svg?branch=master)](https://travis-ci.org/dominicsayers/machinist)
 [![Code Climate](https://codeclimate.com/github/dominicsayers/machinist/badges/gpa.svg)](https://codeclimate.com/github/dominicsayers/machinist)
 [![Test Coverage](https://codeclimate.com/github/dominicsayers/machinist/badges/coverage.svg)](https://codeclimate.com/github/dominicsayers/machinist/coverage)
-[![Dependency Status](https://gemnasium.com/badges/github.com/dominicsayers/machinist.svg)](https://gemnasium.com/github.com/dominicsayers/machinist)
+[![Dependencies](https://badges.depfu.com/badges/f5f7b9d12baad9fbe4070964edfc75d6/overview.svg)](https://depfu.com/github/dominicsayers/machinist)
 [![Security](https://hakiri.io/github/dominicsayers/machinist/master.svg)](https://hakiri.io/github/dominicsayers/machinist/master)
 
 - [Home page](https://github.com/dominicsayers/machinist)
@@ -22,7 +22,7 @@ If you want support for Rails 3 or Rubies prior to 2.2, [go here](https://github
 
 This is a fork of [Pete Yandell's Machinist](http://github.com/notahat/machinist). The original gem was abandoned for the reasons given below, as are most of its forks. The purpose of this fork is to keep Machinist under maintenance for legacy projects that have upgraded to Ruby 2.2 or later and Rails 4.2 or later, but still have Machinist factories in the test environment.
 
-I'm pleased to say that Pete's code runs fine under Ruby 2.2, 2.3 & 2.4 and Rails 4.2, 5.0 and 5.1. I have allowed [RuboCop](https://github.com/bbatsov/rubocop) and [RuboCop RSpec](https://github.com/backus/rubocop-rspec) to suggest some changes, and I have converted to the more up-to-date RSpec syntax using [Transpec](https://github.com/yujinakayama/transpec). Few if any manual changes were needed.
+I'm pleased to say that Pete's code runs fine under Ruby 2.2, 2.3, 2.4 & 2.5 and Rails 4.2, 5.0, 5.1 and 5.2. I have allowed [RuboCop](https://github.com/bbatsov/rubocop) and [RuboCop RSpec](https://github.com/backus/rubocop-rspec) to suggest some changes, and I have converted to the more up-to-date RSpec syntax using [Transpec](https://github.com/yujinakayama/transpec). Few if any manual changes were needed.
 
 Pete Yandell's reason for abandoning Machinist is that he found himself with less and less need for factories in tests. He recommends Bo Jeanes' [excellent article on the topic](http://bjeanes.com/2012/02/factories-breed-complexity).
 
diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
index c238ade..a4af791 100755
--- a/gemfiles/rails_4.2.gemfile
+++ b/gemfiles/rails_4.2.gemfile
@@ -4,19 +4,19 @@ source "http://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "activerecord", "~> 4.2.8", group: :test, require: false
-gem 'sqlite3'
+gem "sqlite3"
+gem "activerecord", "~> 4.2.10", group: :test, require: false
 
 group :development do
-  gem 'appraisal', require: false
-  gem 'gem-release', require: false
-  gem 'github_changelog_generator', require: false
-  gem 'guard', require: false
-  gem 'guard-rspec', require: false
-  gem 'guard-rubocop', require: false
-  gem 'guard-rubycritic', require: false
-  gem 'rdoc', require: false
-  gem 'rubocop-rspec', require: false
+  gem "appraisal", require: false
+  gem "gem-release", "> 1", require: false
+  gem "github_changelog_generator", require: false
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+  gem "guard-rubycritic", require: false
+  gem "rdoc", require: false
+  gem "rubocop-rspec", require: false
 end
 
 group :test do
diff --git a/gemfiles/rails_4.2.gemfile.lock b/gemfiles/rails_4.2.gemfile.lock
index 1326750..2399ec8 100644
--- a/gemfiles/rails_4.2.gemfile.lock
+++ b/gemfiles/rails_4.2.gemfile.lock
@@ -1,74 +1,75 @@
 PATH
   remote: ..
   specs:
-    machinist_redux (3.0.2)
+    machinist_redux (3.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
-    ast (2.3.0)
+    ast (2.4.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.3)
-    codeclimate-engine-rb (0.4.0)
+    codeclimate-engine-rb (0.4.1)
       virtus (~> 1.0)
     codeclimate-test-reporter (1.0.7)
       simplecov
-    coderay (1.1.1)
+    coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    coveralls (0.8.21)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
-      tins (~> 1.6)
+    concurrent-ruby (1.0.5)
+    coveralls (0.7.2)
+      multi_json (~> 1.3)
+      rest-client (= 1.6.7)
+      simplecov (>= 0.7)
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     equalizer (0.0.11)
     erubis (2.7.0)
-    faraday (0.12.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.18)
-    flay (2.9.0)
+    ffi (1.9.23)
+    flay (2.12.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flog (4.6.1)
+    flog (4.6.2)
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
     formatador (0.2.5)
-    fuubar (2.2.0)
+    fuubar (2.3.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gem-release (1.0.0)
+    gem-release (2.0.0.rc.3)
     github_changelog_generator (1.14.3)
       activesupport
       faraday-http-cache
@@ -77,10 +78,10 @@ GEM
       rainbow (>= 2.1)
       rake (>= 10.0)
       retriable (~> 2.1)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -91,13 +92,14 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.2.0)
+    guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
     guard-rubycritic (2.9.3)
       guard (~> 2.6)
       rubycritic (>= 2.9.3)
-    i18n (0.8.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.1.0)
     launchy (2.4.3)
@@ -106,95 +108,100 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.8.2)
-    minitest (5.10.2)
-    multi_json (1.12.1)
+    lumberjack (1.0.13)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.11.3)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.7.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    path_expander (1.0.2)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    path_expander (1.0.3)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rdoc (5.1.0)
-    reek (4.6.2)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rdoc (6.0.4)
+    reek (4.8.1)
       codeclimate-engine-rb (~> 0.4.0)
-      parser (>= 2.4.0.0, < 2.5)
-      rainbow (~> 2.0)
+      parser (>= 2.5.0.0, < 2.6)
+      rainbow (>= 2.0, < 4.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     retriable (2.1.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rspec_junit_formatter (0.4.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
+    rubocop (0.56.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.15.1)
-      rubocop (>= 0.42.0)
-    ruby-progressbar (1.8.1)
+    rubocop-rspec (1.25.1)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
-    ruby_parser (3.9.0)
-      sexp_processor (~> 4.1)
-    rubycritic (3.2.2)
+    ruby_parser (3.11.0)
+      sexp_processor (~> 4.9)
+    rubycritic (3.4.0)
       flay (~> 2.8)
       flog (~> 4.4)
       launchy (= 2.4.3)
-      parser (~> 2.4.0)
-      rainbow (~> 2.1)
+      parser (~> 2.5.0)
+      rainbow (~> 3.0)
       reek (~> 4.4)
       ruby_parser (~> 3.8)
+      tty-which (~> 0.3.0)
       virtus (~> 1.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    sexp_processor (4.9.0)
+    sexp_processor (4.11.0)
     shellany (0.0.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
+    simplecov-html (0.10.2)
     sqlite3 (1.3.13)
-    term-ansicolor (1.6.0)
-      tins (~> 1.0)
-    thor (0.19.4)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
     thread_safe (0.3.6)
-    tins (1.14.0)
-    tzinfo (1.2.3)
+    tins (0.13.2)
+    tty-which (0.3.0)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.3)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -205,12 +212,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 4.2.8)
+  activerecord (~> 4.2.10)
   appraisal
   codeclimate-test-reporter
   coveralls
   fuubar
-  gem-release
+  gem-release (> 1)
   github_changelog_generator
   guard
   guard-rspec
@@ -225,7 +232,7 @@ DEPENDENCIES
   sqlite3
 
 RUBY VERSION
-   ruby 2.3.4p301
+   ruby 2.4.1p111
 
 BUNDLED WITH
-   1.14.6
+   1.16.2
diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
index d018122..04b5617 100755
--- a/gemfiles/rails_5.0.gemfile
+++ b/gemfiles/rails_5.0.gemfile
@@ -4,19 +4,19 @@ source "http://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "activerecord", "~> 5.0.3", group: :test, require: false
-gem 'sqlite3'
+gem "sqlite3"
+gem "activerecord", "~> 5.0.7", group: :test, require: false
 
 group :development do
-  gem 'appraisal', require: false
-  gem 'gem-release', require: false
-  gem 'github_changelog_generator', require: false
-  gem 'guard', require: false
-  gem 'guard-rspec', require: false
-  gem 'guard-rubocop', require: false
-  gem 'guard-rubycritic', require: false
-  gem 'rdoc', require: false
-  gem 'rubocop-rspec', require: false
+  gem "appraisal", require: false
+  gem "gem-release", "> 1", require: false
+  gem "github_changelog_generator", require: false
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+  gem "guard-rubycritic", require: false
+  gem "rdoc", require: false
+  gem "rubocop-rspec", require: false
 end
 
 group :test do
diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock
index 8683b34..315c629 100644
--- a/gemfiles/rails_5.0.gemfile.lock
+++ b/gemfiles/rails_5.0.gemfile.lock
@@ -1,74 +1,73 @@
 PATH
   remote: ..
   specs:
-    machinist_redux (3.0.2)
+    machinist_redux (3.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.0.3)
-      activesupport (= 5.0.3)
-    activerecord (5.0.3)
-      activemodel (= 5.0.3)
-      activesupport (= 5.0.3)
+    activemodel (5.0.7)
+      activesupport (= 5.0.7)
+    activerecord (5.0.7)
+      activemodel (= 5.0.7)
+      activesupport (= 5.0.7)
       arel (~> 7.0)
-    activesupport (5.0.3)
+    activesupport (5.0.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (7.1.4)
-    ast (2.3.0)
+    ast (2.4.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
-    codeclimate-engine-rb (0.4.0)
+    codeclimate-engine-rb (0.4.1)
       virtus (~> 1.0)
     codeclimate-test-reporter (1.0.7)
       simplecov
-    coderay (1.1.1)
+    coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.0.5)
-    coveralls (0.8.21)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
-      tins (~> 1.6)
+    coveralls (0.7.2)
+      multi_json (~> 1.3)
+      rest-client (= 1.6.7)
+      simplecov (>= 0.7)
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     equalizer (0.0.11)
     erubis (2.7.0)
-    faraday (0.12.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.18)
-    flay (2.9.0)
+    ffi (1.9.23)
+    flay (2.12.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flog (4.6.1)
+    flog (4.6.2)
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
     formatador (0.2.5)
-    fuubar (2.2.0)
+    fuubar (2.3.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gem-release (1.0.0)
+    gem-release (2.0.0.rc.3)
     github_changelog_generator (1.14.3)
       activesupport
       faraday-http-cache
@@ -77,10 +76,10 @@ GEM
       rainbow (>= 2.1)
       rake (>= 10.0)
       retriable (~> 2.1)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -91,13 +90,14 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.2.0)
+    guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
     guard-rubycritic (2.9.3)
       guard (~> 2.6)
       rubycritic (>= 2.9.3)
-    i18n (0.8.1)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.1.0)
     launchy (2.4.3)
@@ -106,95 +106,100 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.8.2)
-    minitest (5.10.2)
-    multi_json (1.12.1)
+    lumberjack (1.0.13)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.11.3)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.7.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    path_expander (1.0.2)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    path_expander (1.0.3)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rdoc (5.1.0)
-    reek (4.6.2)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rdoc (6.0.4)
+    reek (4.8.1)
       codeclimate-engine-rb (~> 0.4.0)
-      parser (>= 2.4.0.0, < 2.5)
-      rainbow (~> 2.0)
+      parser (>= 2.5.0.0, < 2.6)
+      rainbow (>= 2.0, < 4.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     retriable (2.1.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rspec_junit_formatter (0.4.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
+    rubocop (0.56.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.15.1)
-      rubocop (>= 0.42.0)
-    ruby-progressbar (1.8.1)
+    rubocop-rspec (1.25.1)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
-    ruby_parser (3.9.0)
-      sexp_processor (~> 4.1)
-    rubycritic (3.2.2)
+    ruby_parser (3.11.0)
+      sexp_processor (~> 4.9)
+    rubycritic (3.4.0)
       flay (~> 2.8)
       flog (~> 4.4)
       launchy (= 2.4.3)
-      parser (~> 2.4.0)
-      rainbow (~> 2.1)
+      parser (~> 2.5.0)
+      rainbow (~> 3.0)
       reek (~> 4.4)
       ruby_parser (~> 3.8)
+      tty-which (~> 0.3.0)
       virtus (~> 1.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    sexp_processor (4.9.0)
+    sexp_processor (4.11.0)
     shellany (0.0.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
+    simplecov-html (0.10.2)
     sqlite3 (1.3.13)
-    term-ansicolor (1.6.0)
-      tins (~> 1.0)
-    thor (0.19.4)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
     thread_safe (0.3.6)
-    tins (1.14.0)
-    tzinfo (1.2.3)
+    tins (0.13.2)
+    tty-which (0.3.0)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.3)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -205,12 +210,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.0.3)
+  activerecord (~> 5.0.7)
   appraisal
   codeclimate-test-reporter
   coveralls
   fuubar
-  gem-release
+  gem-release (> 1)
   github_changelog_generator
   guard
   guard-rspec
@@ -225,7 +230,7 @@ DEPENDENCIES
   sqlite3
 
 RUBY VERSION
-   ruby 2.3.4p301
+   ruby 2.4.1p111
 
 BUNDLED WITH
-   1.14.6
+   1.16.2
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
index 78e3f3a..c800381 100755
--- a/gemfiles/rails_5.1.gemfile
+++ b/gemfiles/rails_5.1.gemfile
@@ -4,19 +4,19 @@ source "http://rubygems.org"
 
 ruby RUBY_VERSION
 
-gem "activerecord", "~> 5.1.1", group: :test, require: false
-gem 'sqlite3'
+gem "sqlite3"
+gem "activerecord", "~> 5.1.6", group: :test, require: false
 
 group :development do
-  gem 'appraisal', require: false
-  gem 'gem-release', require: false
-  gem 'github_changelog_generator', require: false
-  gem 'guard', require: false
-  gem 'guard-rspec', require: false
-  gem 'guard-rubocop', require: false
-  gem 'guard-rubycritic', require: false
-  gem 'rdoc', require: false
-  gem 'rubocop-rspec', require: false
+  gem "appraisal", require: false
+  gem "gem-release", "> 1", require: false
+  gem "github_changelog_generator", require: false
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+  gem "guard-rubycritic", require: false
+  gem "rdoc", require: false
+  gem "rubocop-rspec", require: false
 end
 
 group :test do
diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock
index b0d3c7c..9ca05c0 100644
--- a/gemfiles/rails_5.1.gemfile.lock
+++ b/gemfiles/rails_5.1.gemfile.lock
@@ -1,74 +1,73 @@
 PATH
   remote: ..
   specs:
-    machinist_redux (3.0.2)
+    machinist_redux (3.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.6)
+      activesupport (= 5.1.6)
+    activerecord (5.1.6)
+      activemodel (= 5.1.6)
+      activesupport (= 5.1.6)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (8.0.0)
-    ast (2.3.0)
+    ast (2.4.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
-    codeclimate-engine-rb (0.4.0)
+    codeclimate-engine-rb (0.4.1)
       virtus (~> 1.0)
     codeclimate-test-reporter (1.0.7)
       simplecov
-    coderay (1.1.1)
+    coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.0.5)
-    coveralls (0.8.21)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
-      tins (~> 1.6)
+    coveralls (0.7.2)
+      multi_json (~> 1.3)
+      rest-client (= 1.6.7)
+      simplecov (>= 0.7)
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     equalizer (0.0.11)
     erubis (2.7.0)
-    faraday (0.12.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.18)
-    flay (2.9.0)
+    ffi (1.9.23)
+    flay (2.12.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flog (4.6.1)
+    flog (4.6.2)
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
     formatador (0.2.5)
-    fuubar (2.2.0)
+    fuubar (2.3.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gem-release (1.0.0)
+    gem-release (2.0.0.rc.3)
     github_changelog_generator (1.14.3)
       activesupport
       faraday-http-cache
@@ -77,10 +76,10 @@ GEM
       rainbow (>= 2.1)
       rake (>= 10.0)
       retriable (~> 2.1)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -91,13 +90,14 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.2.0)
+    guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
     guard-rubycritic (2.9.3)
       guard (~> 2.6)
       rubycritic (>= 2.9.3)
-    i18n (0.8.1)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.1.0)
     launchy (2.4.3)
@@ -106,95 +106,100 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.8.2)
-    minitest (5.10.2)
-    multi_json (1.12.1)
+    lumberjack (1.0.13)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.11.3)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.7.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    path_expander (1.0.2)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    path_expander (1.0.3)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rdoc (5.1.0)
-    reek (4.6.2)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rdoc (6.0.4)
+    reek (4.8.1)
       codeclimate-engine-rb (~> 0.4.0)
-      parser (>= 2.4.0.0, < 2.5)
-      rainbow (~> 2.0)
+      parser (>= 2.5.0.0, < 2.6)
+      rainbow (>= 2.0, < 4.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     retriable (2.1.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rspec_junit_formatter (0.4.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
+    rubocop (0.56.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.15.1)
-      rubocop (>= 0.42.0)
-    ruby-progressbar (1.8.1)
+    rubocop-rspec (1.25.1)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
-    ruby_parser (3.9.0)
-      sexp_processor (~> 4.1)
-    rubycritic (3.2.2)
+    ruby_parser (3.11.0)
+      sexp_processor (~> 4.9)
+    rubycritic (3.4.0)
       flay (~> 2.8)
       flog (~> 4.4)
       launchy (= 2.4.3)
-      parser (~> 2.4.0)
-      rainbow (~> 2.1)
+      parser (~> 2.5.0)
+      rainbow (~> 3.0)
       reek (~> 4.4)
       ruby_parser (~> 3.8)
+      tty-which (~> 0.3.0)
       virtus (~> 1.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    sexp_processor (4.9.0)
+    sexp_processor (4.11.0)
     shellany (0.0.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
+    simplecov-html (0.10.2)
     sqlite3 (1.3.13)
-    term-ansicolor (1.6.0)
-      tins (~> 1.0)
-    thor (0.19.4)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
     thread_safe (0.3.6)
-    tins (1.14.0)
-    tzinfo (1.2.3)
+    tins (0.13.2)
+    tty-which (0.3.0)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.3)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -205,12 +210,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.1.1)
+  activerecord (~> 5.1.6)
   appraisal
   codeclimate-test-reporter
   coveralls
   fuubar
-  gem-release
+  gem-release (> 1)
   github_changelog_generator
   guard
   guard-rspec
@@ -225,7 +230,7 @@ DEPENDENCIES
   sqlite3
 
 RUBY VERSION
-   ruby 2.3.4p301
+   ruby 2.4.1p111
 
 BUNDLED WITH
-   1.14.6
+   1.16.2
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
new file mode 100644
index 0000000..14603e9
--- /dev/null
+++ b/gemfiles/rails_5.2.gemfile
@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+ruby RUBY_VERSION
+
+gem "sqlite3"
+gem "activerecord", "~> 5.2.0", group: :test, require: false
+
+group :development do
+  gem "appraisal", require: false
+  gem "gem-release", "> 1", require: false
+  gem "github_changelog_generator", require: false
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+  gem "guard-rubycritic", require: false
+  gem "rdoc", require: false
+  gem "rubocop-rspec", require: false
+end
+
+group :test do
+  gem "codeclimate-test-reporter", require: false
+  gem "coveralls", require: false
+  gem "fuubar", require: false
+  gem "rspec", require: false
+  gem "rspec_junit_formatter", require: false
+  gem "simplecov", "~> 0.14", require: false
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock
new file mode 100644
index 0000000..a56460c
--- /dev/null
+++ b/gemfiles/rails_5.2.gemfile.lock
@@ -0,0 +1,231 @@
+PATH
+  remote: ..
+  specs:
+    machinist_redux (3.0.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    ast (2.4.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    codeclimate-engine-rb (0.4.1)
+      virtus (~> 1.0)
+    codeclimate-test-reporter (1.0.7)
+      simplecov
+    coderay (1.1.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    faraday (0.15.2)
+      multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
+    ffi (1.9.23)
+    flay (2.12.0)
+      erubis (~> 2.7.0)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
+    flog (4.6.2)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.1, > 3.1.0)
+      sexp_processor (~> 4.8)
+    formatador (0.2.5)
+    fuubar (2.3.1)
+      rspec-core (~> 3.0)
+      ruby-progressbar (~> 1.4)
+    gem-release (2.0.0.rc.3)
+    github_changelog_generator (1.14.3)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.1)
+      rake (>= 10.0)
+      retriable (~> 2.1)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.3.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    guard-rubycritic (2.9.3)
+      guard (~> 2.6)
+      rubycritic (>= 2.9.3)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    json (2.1.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.13)
+    method_source (0.9.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    nenv (0.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (4.9.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    path_expander (1.0.3)
+    powerpack (0.1.1)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rdoc (6.0.4)
+    reek (4.8.1)
+      codeclimate-engine-rb (~> 0.4.0)
+      parser (>= 2.5.0.0, < 2.6)
+      rainbow (>= 2.0, < 4.0)
+    retriable (2.1.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rspec_junit_formatter (0.4.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.56.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.25.1)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.9.0)
+    ruby_dep (1.5.0)
+    ruby_parser (3.11.0)
+      sexp_processor (~> 4.9)
+    rubycritic (3.4.0)
+      flay (~> 2.8)
+      flog (~> 4.4)
+      launchy (= 2.4.3)
+      parser (~> 2.5.0)
+      rainbow (~> 3.0)
+      reek (~> 4.4)
+      ruby_parser (~> 3.8)
+      tty-which (~> 0.3.0)
+      virtus (~> 1.0)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    sexp_processor (4.11.0)
+    shellany (0.0.1)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sqlite3 (1.3.13)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.16.3)
+    tty-which (0.3.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.3.3)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.2.0)
+  appraisal
+  codeclimate-test-reporter
+  coveralls
+  fuubar
+  gem-release (> 1)
+  github_changelog_generator
+  guard
+  guard-rspec
+  guard-rubocop
+  guard-rubycritic
+  machinist_redux!
+  rdoc
+  rspec
+  rspec_junit_formatter
+  rubocop-rspec
+  simplecov (~> 0.14)
+  sqlite3
+
+RUBY VERSION
+   ruby 2.4.1p111
+
+BUNDLED WITH
+   1.16.2
diff --git a/lib/generators/machinist/install/install_generator.rb b/lib/generators/machinist/install/install_generator.rb
index 9ff51bf..8d4e4e9 100644
--- a/lib/generators/machinist/install/install_generator.rb
+++ b/lib/generators/machinist/install/install_generator.rb
@@ -1,7 +1,7 @@
 module Machinist
   module Generators #:nodoc:
     class InstallGenerator < Rails::Generators::Base #:nodoc:
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       class_option :test_framework, type: :string, aliases: '-t', desc: 'Test framework to use Machinist with'
       class_option :cucumber, type: :boolean, desc: 'Set up access to Machinist from Cucumber'
@@ -23,9 +23,7 @@ def test_helper
       end
 
       def cucumber_support
-        if cucumber?
-          template 'machinist.rb.erb', 'features/support/machinist.rb'
-        end
+        template 'machinist.rb.erb', 'features/support/machinist.rb' if cucumber?
       end
 
       private
diff --git a/lib/machinist/blueprint.rb b/lib/machinist/blueprint.rb
index 4ff6fa8..a31f1a7 100644
--- a/lib/machinist/blueprint.rb
+++ b/lib/machinist/blueprint.rb
@@ -66,7 +66,7 @@ def new_serial_number #:nodoc:
       else
         @serial_number ||= 0
         @serial_number += 1
-        sprintf('%04d', @serial_number)
+        format('%04d', @serial_number)
       end
     end
 
diff --git a/lib/machinist/lathe.rb b/lib/machinist/lathe.rb
index 7b8bcad..41eb810 100755
--- a/lib/machinist/lathe.rb
+++ b/lib/machinist/lathe.rb
@@ -23,9 +23,7 @@ def sn
     attr_reader :object
 
     def method_missing(attribute, *args, &block) #:nodoc:
-      unless attribute_assigned?(attribute)
-        assign_attribute(attribute, make_attribute(attribute, args, &block))
-      end
+      assign_attribute(attribute, make_attribute(attribute, args, &block)) unless attribute_assigned?(attribute)
     end
 
     # Undef a couple of methods that are common ActiveRecord attributes.
diff --git a/lib/machinist/version.rb b/lib/machinist/version.rb
index 7e8d6c6..610e0b3 100755
--- a/lib/machinist/version.rb
+++ b/lib/machinist/version.rb
@@ -1,3 +1,3 @@
 module Machinist
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.4'.freeze
 end
diff --git a/machinist.gemspec b/machinist.gemspec
index fb5634d..874fac2 100755
--- a/machinist.gemspec
+++ b/machinist.gemspec
@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'machinist/version'