Merge pull request RolifyCommunity#388 from lorefnon/compat/385

Support Rails 5

.travis.yml

@@ -1,24 +1,87 @@
 language: ruby
 sudo: false
 
-rvm:
-  - 2.2.3
-  - 2.2.2
-  - 2.1.2
-  - 2.0.0
-
 before_install:
   - gem update --system
   - gem install bundler
   - gem --version
 
 script: bundle exec rake
 
-env:
-  - ADAPTER=active_record
-  - ADAPTER=mongoid MONGOID_VERSION=3
-  - ADAPTER=mongoid MONGOID_VERSION=4
-  - ADAPTER=mongoid MONGOID_VERSION=5
+matrix:
+  include:
+    - rvm: 2.3.0
+      gemfile: gemfiles/activerecord_3.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.2.4
+      gemfile: gemfiles/activerecord_3.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.1.8
+      gemfile: gemfiles/activerecord_3.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.0.0
+      gemfile: gemfiles/activerecord_3.gemfile
+      env: ADAPTER=active_record
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/activerecord_4.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.2.4
+      gemfile: gemfiles/activerecord_4.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.1.8
+      gemfile: gemfiles/activerecord_4.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.0.0
+      gemfile: gemfiles/activerecord_4.gemfile
+      env: ADAPTER=active_record
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/activerecord_5.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.2.4
+      gemfile: gemfiles/activerecord_5.gemfile
+      env: ADAPTER=active_record
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/mongoid_3.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.2.4
+      gemfile: gemfiles/mongoid_3.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.1.8
+      gemfile: gemfiles/mongoid_3.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.0.0
+      gemfile: gemfiles/mongoid_3.gemfile
+      env: ADAPTER=mongoid
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/mongoid_4.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.2.4
+      gemfile: gemfiles/mongoid_4.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.1.8
+      gemfile: gemfiles/mongoid_4.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.0.0
+      gemfile: gemfiles/mongoid_4.gemfile
+      env: ADAPTER=mongoid
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.2.4
+      gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.1.8
+      gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.0.0
+      gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=mongoid
+
 
 services: mongodb
 

Appraisals

@@ -0,0 +1,41 @@
+appraise 'mongoid-3' do
+  gem "mongoid", "~> 3"
+  gem "bson_ext", :platform => "ruby"
+end
+
+appraise 'mongoid-4' do
+  gem "mongoid", "~> 4"
+  gem "bson_ext", :platform => "ruby"
+end
+
+appraise 'mongoid-5' do
+  gem "mongoid", "~> 5"
+  gem "bson_ext", :platform => "ruby"
+end
+
+appraise 'activerecord-3' do
+  gem "sqlite3", :platform => "ruby"
+  gem "activerecord", ">= 3.2.0", :require => "active_record"
+end
+
+appraise 'activerecord-4' do
+  gem "sqlite3", :platform => "ruby"
+  gem "activerecord", ">= 4.2.5", :require => "active_record"
+end
+
+appraise 'activerecord-5' do
+  gem "sqlite3", :platform => "ruby"
+  gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
+
+  # Ammeter dependencies:
+  gem "actionpack", ">= 5.0.0.beta2"
+  gem "activemodel", ">= 5.0.0.beta2"
+  gem "railties", ">= 5.0.0.beta2"
+
+  gem 'rspec-rails'       , github: 'rspec/rspec-rails'
+  gem 'rspec-core'        , github: 'rspec/rspec-core'
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations'
+  gem 'rspec-mocks'       , github: 'rspec/rspec-mocks'
+  gem 'rspec-support'     , github: 'rspec/rspec-support'
+
+end

Gemfile

@@ -1,25 +1,7 @@
 source "https://rubygems.org"
 
 group :test do
-  case ENV["ADAPTER"]
-  when nil, "active_record"
-    gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.rc", :platform => "jruby"
-    gem "sqlite3", :platform => "ruby"
-    gem "activerecord", ">= 3.2.0", :require => "active_record"
-  when "mongoid"
-    case ENV["MONGOID_VERSION"]
-    when nil, '5'
-      gem "mongoid", "~> 5"
-    when '4'
-      gem "mongoid", "~> 4"
-    when '3'
-      gem "mongoid", "~> 3"
-    end
-    gem "bson_ext", :platform => "ruby"
-  else
-    raise "Unknown model adapter: #{ENV["ADAPTER"]}"
-  end
-
+  gem 'appraisal'
   gem 'coveralls', :require => false
   gem 'its'
   gem 'byebug'

Rakefile

@@ -14,7 +14,11 @@ RSpec::Core::RakeTask.new(:rolify) do |task|
   task.pattern = 'spec/rolify/**/*_spec.rb'
 end
 
-task :default => [ :spec, 'coveralls:push' ]
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default => :appraisal
+else
+  task :default => [ :spec, 'coveralls:push' ]
+end
 
 desc 'Run all specs'
 task 'spec' do

gemfiles/activerecord_3.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform => "ruby"
+gem "activerecord", ">= 3.2.0", :require => "active_record"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

gemfiles/activerecord_4.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform => "ruby"
+gem "activerecord", ">= 4.2.5", :require => "active_record"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

gemfiles/activerecord_5.gemfile

@@ -0,0 +1,27 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform => "ruby"
+gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
+gem "actionpack", ">= 5.0.0.beta2"
+gem "activemodel", ">= 5.0.0.beta2"
+gem "railties", ">= 5.0.0.beta2"
+gem "rspec-rails", :github => "rspec/rspec-rails"
+gem "rspec-core", :github => "rspec/rspec-core"
+gem "rspec-expectations", :github => "rspec/rspec-expectations"
+gem "rspec-mocks", :github => "rspec/rspec-mocks"
+gem "rspec-support", :github => "rspec/rspec-support"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

gemfiles/mongoid_3.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 3"
+gem "bson_ext", :platform => "ruby"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

gemfiles/mongoid_4.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 4"
+gem "bson_ext", :platform => "ruby"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

gemfiles/mongoid_5.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 5"
+gem "bson_ext", :platform => "ruby"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

lib/generators/active_record/rolify_generator.rb

@@ -37,6 +37,8 @@ def copy_rolify_migration
         migration_template "migration.rb", "db/migrate/rolify_create_#{table_name}.rb"
       end
 
+      private
+
       def join_table
         user_class.table_name + "_" + table_name
       end
@@ -56,7 +58,10 @@ def model_path
       def model_content
         content = <<RUBY
   has_and_belongs_to_many :%{user_cname}, :join_table => :%{join_table}
-  belongs_to :resource, :polymorphic => true
+
+  belongs_to :resource,
+             :polymorphic => true,
+             :optional => true
 
   validates :resource_type,
             :inclusion => { :in => Rolify.resource_types },

spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -45,7 +45,10 @@ class User < ActiveRecord::Base
       it { should exist }
       it { should contain "class Role < ActiveRecord::Base" }
       it { should contain "has_and_belongs_to_many :users, :join_table => :users_roles" }
-      it { should contain "belongs_to :resource, :polymorphic => true" }
+      it { should contain "belongs_to :resource,\n"
+                          "           :polymorphic => true,\n"
+                          "           :optional => true"
+      }
       it { should contain "validates :resource_type,\n"
                           "          :inclusion => { :in => Rolify.resource_types },\n"
                           "          :allow_nil => true" }
@@ -93,7 +96,10 @@ class User < ActiveRecord::Base
       it { should exist }
       it { should contain "class AdminRole < ActiveRecord::Base" }
       it { should contain "has_and_belongs_to_many :admin_users, :join_table => :admin_users_admin_roles" }
-      it { should contain "belongs_to :resource, :polymorphic => true" }
+      it { should contain "belongs_to :resource,\n"
+                          "           :polymorphic => true,\n"
+                          "           :optional => true"
+      }
     end
 
     describe 'app/models/admin_user.rb' do
@@ -145,7 +151,10 @@ class User < ActiveRecord::Base
       it { should exist }
       it { should contain "class Admin::Role < ActiveRecord::Base" }
       it { should contain "has_and_belongs_to_many :admin_users, :join_table => :admin_users_admin_roles" }
-      it { should contain "belongs_to :resource, :polymorphic => true" }
+      it { should contain "belongs_to :resource,\n"
+                          "           :polymorphic => true,\n"
+                          "           :optional => true"
+      }
     end
 
     describe 'app/models/admin/user.rb' do