Features/rails 5 2 6

Appraisals

@@ -1,97 +1,231 @@
-appraise "rails-4-0-mysql" do
-  gem "mysql2", "~> 0.3.10"
-  gem "rails", "4.0.13"
-end
+ruby_version = Gem::Version.new(RUBY_VERSION)
+
+# In Ruby 2.4 some incompatibility wth numeric types was created that affected
+# Rails 4.0 and 4.1 making them unable to run
+# More info: https://stackoverflow.com/questions/41504106/ruby-2-4-and-rails-4-stack-level-too-deep-systemstackerror
+ruby_2_4 = Gem::Version.new('2.4.0')
+
+# Rails 6 demands ruby over 2.4.4
+ruby_2_4_4 = Gem::Version.new('2.4.4')
+
+# Globalize latest version (5.3.0) demands ruby over 2.4.6. We need to force
+# another version in prior versions
+ruby_2_4_6 = Gem::Version.new('2.4.6')
+
+if ruby_version < ruby_2_4
+
+  appraise "rails-4-0-mysql" do
+    gemspec
+    gem "mysql2", "~> 0.3.10"
+    gem "rails", "4.0.13"
+    gem 'rspec-rails', '3.5.0'
+  end
+
+  appraise "rails-4-1-mysql" do
+    gemspec
+    gem "mysql2", "~> 0.3.13"
+    gem "rails", "4.1.16"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
 
-appraise "rails-4-1-mysql" do
-  gem "mysql2", "~> 0.3.13"
-  gem "rails", "4.1.16"
 end
 
 appraise "rails-4-2-mysql" do
+  gemspec
   gem "mysql2"
-  gem "rails", "4.2.9"
+  gem "rails", "4.2.11.1"
+  gem 'rspec-rails', '~> 3.5.0.beta'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-0-mysql" do
+  gemspec
   gem "mysql2"
-  gem 'rails', '5.0.5'
-  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
-  gem "activesupport", "~> 5.0.0"
+  gem 'rails', '5.0.7.2'
   gem "awesome_nested_set", '~> 3.1.1'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-1-mysql" do
+  gemspec
   gem "mysql2"
-  gem 'rails', '5.1.3'
-  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
+  gem 'rails', '5.1.7'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
-appraise "rails-4-0-pgsql" do
-  gem "pg"
-  gem "rails", "4.0.13"
+appraise "rails-5-2-mysql" do
+  gemspec
+  gem "mysql2"
+  gem 'rails', '5.2.3'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
-appraise "rails-4-1-pgsql" do
-  gem "pg"
-  gem "rails", "4.1.16"
+if ruby_version > ruby_2_4_4
+  appraise "rails-6-rc-mysql" do
+    gemspec
+    gem "mysql2"
+    gem 'awesome_nested_set', git: '[email protected]:collectiveidea/awesome_nested_set.git'
+    gem 'actionpack', '6.0.0.rc1'
+    gem 'rails', '6.0.0.rc1'
+    gem 'rspec-rails'
+  end
+end
+
+if ruby_version < ruby_2_4
+
+  appraise "rails-4-0-pgsql" do
+    gemspec
+    gem "pg", '~> 0.21.0'
+    gem "rails", "4.0.13"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
+
+  appraise "rails-4-1-pgsql" do
+    gemspec
+    gem "pg", '~> 0.21.0'
+    gem "rails", "4.1.16"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
 end
 
 appraise "rails-4-2-pgsql" do
-  gem "pg"
-  gem "rails", "4.2.9"
+  gemspec
+  gem "pg", '~> 0.21.0'
+  gem "rails", "4.2.11.1"
+  gem 'rspec-rails', '~> 3.5.0.beta'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-0-pgsql" do
+  gemspec
   gem "pg"
-  gem 'rails', '5.0.5'
-  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
+  gem 'rails', '5.0.7.2'
   gem "awesome_nested_set", '~> 3.1.1'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-1-pgsql" do
+  gemspec
   gem "pg"
-  gem 'rails', '5.1.3'
-  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
+  gem 'rails', '5.1.7'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
-appraise "rails-4-0-sqlite" do
-  gem "sqlite3"
-  gem "rails", "4.0.13"
+appraise "rails-5-2-pgsql" do
+  gemspec
+  gem "pg"
+  gem 'rails', '5.2.3'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
-appraise "rails-4-1-sqlite" do
-  gem "sqlite3"
-  gem "rails", "4.1.16"
+if ruby_version > ruby_2_4_4
+  appraise "rails-6-rc-pgsql" do
+    gemspec
+    gem "pg"
+    gem 'rails', '6.0.0.rc1'
+    gem 'actionpack', '6.0.0.rc1'
+    gem 'activemodel', '6.0.0.rc1'
+    gem 'activerecord', '6.0.0.rc1'
+    gem 'activesupport', '6.0.0.rc1'
+    gem 'railties', '6.0.0.rc1'
+    gem 'awesome_nested_set', git: '[email protected]:collectiveidea/awesome_nested_set.git'
+    gem 'rspec-rails'
+  end
+end
+
+if ruby_version < ruby_2_4
+
+  appraise "rails-4-0-sqlite" do
+    gemspec
+    gem "sqlite3", '~> 1.3.13'
+    gem "rails", "4.0.13"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
+
+  appraise "rails-4-1-sqlite" do
+    gemspec
+    gem "sqlite3", '~> 1.3.13'
+    gem "rails", "4.1.16"
+    gem 'rspec-rails', '~> 3.5.0.beta'
+  end
+
 end
 
 appraise "rails-4-2-sqlite" do
-  gem "sqlite3"
-  gem "rails", "4.2.9"
+  gemspec
+  gem "sqlite3", '~> 1.3.13'
+  gem "rails", "4.2.11.1"
+  gem 'rspec-rails', '~> 3.5.0.beta'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-0-sqlite" do
-  gem "sqlite3"
-  gem 'rails', '5.0.5'
-  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
-  gem "activesupport", "~> 5.0.0"
+  gemspec
+  gem "sqlite3", '~> 1.3.13'
+  gem 'rails', '5.0.7.2'
   gem "awesome_nested_set", '~> 3.1.1'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
 end
 
 appraise "rails-5-1-sqlite" do
+  gemspec
+  gem "sqlite3"
+  gem 'rails', '5.1.7'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
+end
+
+appraise "rails-5-2-sqlite" do
+  gemspec
   gem "sqlite3"
-  gem 'rails', '5.1.3'
-  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
-  gem 'rails-observers', github: 'rails/rails-observers'
-  gem 'activeresource', github: 'rails/activeresource'
+  gem 'rails', '5.2.3'
+  gem 'rspec-rails'
+  if ruby_version < ruby_2_4_6
+    gem 'globalize', '~> 5.2.0'
+  end
+end
+
+if ruby_version > ruby_2_4_4
+  appraise "rails-6-rc-sqlite" do
+    gemspec
+    gem "sqlite3"
+    gem 'rails', '6.0.0.rc1'
+
+    gem 'actionpack', '6.0.0.rc1'
+    gem 'activemodel', '6.0.0.rc1'
+    gem 'activerecord', '6.0.0.rc1'
+    gem 'activesupport', '6.0.0.rc1'
+    gem 'railties', '6.0.0.rc1'
+    gem 'awesome_nested_set', git: '[email protected]:collectiveidea/awesome_nested_set.git'
+    gem 'rspec-rails'
+  end
 end

CHANGELOG

@@ -1,4 +1,4 @@
-Edge
+1.2.0
 
   - Support for rails 4.2.X, 4.1.X, 5.0.X and 5.1.X
   - Slots for allowing to create multiple relationships between blocks and other
@@ -14,7 +14,7 @@ Edge
   - Added multiple ActiveRecord/ActiveResource fields
   - Added appraisals to test support with PostgreSQL
   - Configurable database serializer: Hash and JSON.
-  - Configurable database serializer: :hstore. THis includes support for
+  - Configurable database serializer: :hstore. This includes support for
     PostgreSQL's hstore serialization.
   - Fallback behaviour on translations.
   - Added template_layout parameter in block configuration.

Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # Declare your gem's dependencies in nocms-blocks.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
-gemspec
+# gemspec
 
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
@@ -22,10 +22,9 @@ group :development, :test do
 end
 
 group :test do
-  gem 'rspec-rails', '~> 3.5.0.beta'
   gem 'capybara-screenshot'
   gem 'factory_girl'
-  gem 'capybara'
+  gem 'capybara', '< 3.16'
   gem 'database_cleaner'
   gem 'faker'
   gem 'carrierwave' # For development and testing purposes (Images)