paranoia 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25bfc4e0254aba4db5a58da8d666c68052e836bc2f315efbcd5ec2b77657b30
-  data.tar.gz: d413ea576910faa0e4ebaff07c617c8692db837beeb24a5d5d43d0794170981f
+  metadata.gz: b5558705162917407085514b9cc59f7be24f1a9aa8dfdc1d58588e4a7beb975e
+  data.tar.gz: b6e3bf484414fd2daa322bdf9fa5479d05815d3a14a312217854578ea5f19c8e
 SHA512:
-  metadata.gz: 354429a32eb5c97b1662456e56a5df64ff8b2c0d4ae02e57d528384eb33c17a161f5972275babfd55c279f7de54552073ae425c9a2c4b676a383ca55c83a8cfe
-  data.tar.gz: 3f5e1914d1f200e82c8e1775bf2859e253b7aa6b434eaaf841276db9f017185f0f985ff7ef80ed53d103b1f21762419315568aa097a662946aab85db28431369
+  metadata.gz: 50af9f20d148fca67815e2786fd70d6d539fb0c0ae7013abdc3dfb5707b9c1993a56ad02032f1cdd983a8d90088950b564cba9f81a6295169d61fe35d9a574fc
+  data.tar.gz: 6f46d6a812faf1efa4e8c654289a88fdd089ddbc899a12e5432161e0460bb29fe2f0d5d5611b4b5bf69f67f41fa802af53195017d8591e7727d871078e9c8dce

data/.travis.yml

@@ -4,25 +4,36 @@ before_install: gem update --system
 cache: bundler
 rvm:
   - 2.2
-  - 2.3.5
-  - 2.4.3
-  - 2.5.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.3
   - jruby-9.1.6.0
 
 env:
   matrix:
-    - RAILS='~> 4.2.0'
-    - RAILS='~> 5.0.0'
+    - RAILS='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'
+    - RAILS='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
     - RAILS='~> 5.1.0'
     - RAILS='~> 5.2.0'
+    - RAILS='master'
 
 matrix:
   allow_failures:
-    - env: RAILS='~> 4.2.0'
+    - env: RAILS='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'
       rvm: jruby-9.1.6.0
-    - env: RAILS='~> 5.0.0'
+    - env: RAILS='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
       rvm: jruby-9.1.6.0
     - env: RAILS='~> 5.1.0'
       rvm: jruby-9.1.6.0
     - env: RAILS='~> 5.2.0'
       rvm: jruby-9.1.6.0
+    - env: RAILS='master'
+      rvm: jruby-9.1.6.0
+  exclude:
+    - rvm: 2.2
+      env: RAILS='master'
+    - rvm: 2.3.8
+      env: RAILS='master'
+    - rvm: 2.4.5
+      env: RAILS='master'

data/CHANGELOG.md

@@ -1,8 +1,14 @@
 # paranoia Changelog
 
+## 2.4.2
+
+* [#470](https://github.com/rubysherpas/paranoia/pull/470) Add support for ActiveRecord 6.0
+
+  [Anton Kolodii](https://github.com/iggant), [Jared Norman](https://github.com/jarednorman)
+
 ## 2.4.1
 
-* [#435](https://github.com/rubysherpas/paranoia/pull/435) Monkeypatch activerecord relations to work with rails 6.2.0
+* [#435](https://github.com/rubysherpas/paranoia/pull/435) Monkeypatch activerecord relations to work with rails 5.2.0
 
   [Bartosz Bonisławski (@bbonislawski)](https://github.com/bbonislawski)
 

data/Gemfile

@@ -1,20 +1,30 @@
 source 'https://rubygems.org'
 
-gem 'sqlite3', platforms: [:ruby]
+sqlite = ENV['SQLITE_VERSION']
+
+if sqlite
+  gem 'sqlite3', sqlite, platforms: [:ruby]
+else
+  gem 'sqlite3', platforms: [:ruby]
+end
 
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
 platforms :rbx do
+  gem 'rubinius-developer_tools'
   gem 'rubysl', '~> 2.0'
   gem 'rubysl-test-unit'
-  gem 'rubinius-developer_tools'
 end
 
 rails = ENV['RAILS'] || '~> 5.2.0'
 
-gem 'rails', rails
+if rails == 'master'
+  gem 'rails', github: 'rails/rails'
+else
+  gem 'rails', rails
+end
 
 # Specify your gem's dependencies in paranoia.gemspec
 gemspec

data/lib/paranoia.rb

@@ -1,6 +1,7 @@
 require 'active_record' unless defined? ActiveRecord
 
-if [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [5, 2]
+if [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [5, 2] ||
+   ActiveRecord::VERSION::MAJOR > 5
   require 'paranoia/active_record_5_2'
 end
 
@@ -305,7 +306,7 @@ module ActiveRecord
     class UniquenessValidator < ActiveModel::EachValidator
       prepend UniquenessParanoiaValidator
     end
-    
+
     class AssociationNotSoftDestroyedValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         # if association is soft destroyed, add an error

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = '2.4.1'.freeze
+  VERSION = '2.4.2'.freeze
 end

data/paranoia.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0'
 
-  s.add_dependency 'activerecord', '>= 4.0', '< 5.3'
+  s.add_dependency 'activerecord', '>= 4.0', '< 6.1'
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,