Merge remote-tracking branch 'origin/22790_rails_5_2'

* origin/22790_rails_5_2:
  Fix version inclusion
  Updates to support rails 5.2

Version 0.4.1

.ruby-version

@@ -1 +1 @@
-2.2
+2.4.6

Gemfile

@@ -1,21 +1,20 @@
 source "https://rubygems.org"
 
+ruby "2.4.6"
+
 # Specify your gem's dependencies in flat_map.gemspec
 gemspec
 
-group :development do
-  gem 'redcarpet'
-  gem 'yard'
-end
+gem "activerecord", "~> 5.2"
+gem "activesupport", "~> 5.2"
+
+gem 'redcarpet'
+gem 'yard'
 
-group :development, :test do
-  # code metrics:
-  gem "metric_fu"
-  gem "pry"
-end
+# code metrics:
+gem "metric_fu"
+gem "pry"
 
-group :test do
-  gem 'colorize'           , :require => false
-  gem 'simplecov'          , :require => false
-  gem 'simplecov-rcov-text', :require => false
-end
+gem 'colorize'           , :require => false
+gem 'simplecov'          , :require => false
+gem 'simplecov-rcov-text', :require => false

HornsAndHooves-flat_map.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_dependency(%q<activesupport>, ["~> 4.2"])
-  s.add_dependency(%q<activerecord>, ["~> 4.2"])
-  s.add_dependency(%q<yard>, [">= 0"])
+  s.add_dependency "activesupport", ">= 4.2", "< 6.0.0"
+  s.add_dependency "activerecord", ">= 4.2", "< 6.0.0"
+  s.add_dependency "yard"
 
-  s.add_development_dependency "rspec", ['~> 3.5']
+  s.add_development_dependency "rspec", '~> 3.5'
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rake"
 end

lib/flat_map/version.rb

@@ -1,3 +1,3 @@
 module FlatMap # :nodoc:
-  VERSION = "0.4.0" # :nodoc:
+  VERSION = "0.4.1" # :nodoc:
 end