cancancan 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0cac57012f776fb962fcfa0fd97d92c11b47628
-  data.tar.gz: c0c7f568a6307585076c3ffb622dd2f5d1f464e3
+  metadata.gz: de52624409f514745004820cec9c89f9c0ce7bd8
+  data.tar.gz: aa37a4dc4a6ae653dc16011234c25836e0a91c95
 SHA512:
-  metadata.gz: c5198aeba210ef606f29cb1c743edafa78c0022ad25ffa0c20363050e9fca225133f97ee1482fe50857182e90d0c70346bcb9880c02dedbe741270ecb10aad10
-  data.tar.gz: 32ffcf4998583cce920d79d4f1401f5dcbfe6df0a15b6199591079cbd586cb57defc4f892d01f083b16471c700dd2ba377eb0a63ab6b995a3db4c27d8df55d4d
+  metadata.gz: 1c7fbce656e4036056222252e96b4990408ca98bc30af5d5a682b32e1903cab76852dea0e44a0d5a4eac731fd5eb95b2b3d527c48236b2463c2b4cc1fed2df20
+  data.tar.gz: 7bc3653619d6fa4b9b833736f4e9467128edb388310056859c82ac86e98382e4c250bcce72961072e2406240288e59bf66d3066fdd9b747f8d5d5c596e7611ab

data/cancancan.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files lib init.rb cancancan.gemspec`.split($INPUT_RECORD_SEPARATOR)
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.2.0'
 
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rubocop', '~> 0.48.1'

data/lib/cancan/controller_additions.rb

@@ -384,9 +384,12 @@ module CanCan
   end
 end
 
-if defined? ActionController
-  %w[Base API].each do |klass|
-    next unless ActionController.const_defined?(klass)
-    ActionController.const_get(klass).class_eval { include CanCan::ControllerAdditions }
+if defined? ActionController::Base
+  ActionController::Base.class_eval do
+    include CanCan::ControllerAdditions
+  end
+elsif defined? ActionController::API
+  ActionController::API.class_eval do
+    include CanCan::ControllerAdditions
   end
 end

data/lib/cancan/version.rb

@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Alessandro Rodi (Renuo AG)
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="