zombie_record 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 603d03ebaf5a1164056c49beee4ec41096f681e5d158c2cc9cc31f58a357fbdb
-  data.tar.gz: 8847571885cacaf878e96649a4fd694f91b991ff1eb67b76506228e1412ed433
+  metadata.gz: 91ed49648bae95bb6a4161ab05bad01147c4be33bfef1ed4088a581588194942
+  data.tar.gz: 28e55007206dd1faf809bb7f7bdd325242961207eedb6a0da678783473c9a917
 SHA512:
-  metadata.gz: 4fe171d2153615597613d3d8d539533241fcbc000dbb08b65f91fb5002555245089304556d0ade242b89010b2e21a3b195d2427a825b3fee254ef159c5bb2384
-  data.tar.gz: 955b8357b8d2fbd008e4e2e1653bf6cf6dff00d44688279d269a7e8679e50a471b0824c36ae3cd57c952a6ba848442f4d61abbfd787f839c2601f10a4297997a
+  metadata.gz: aa39de754f5be4286e20f82a8d6e2bac2b7145f688ba02f6d506ee27e8d02e6e2338bf05511764610267ebd4d46868183358f71a69e1b60517e1e8398825de76
+  data.tar.gz: 2dedb8380345395471c552719164080e6d8a970619a27d5ac7642a0f898536160fa5b5883c88ebdf222cf0dfd9b21affe396919344b4f5820512e920e21509be

data/.github/workflows/ci.yml

@@ -0,0 +1,58 @@
+name: CI
+
+on: push
+
+jobs:
+  specs:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+        gemfile:
+          - rails5.0
+          - rails5.1
+          - rails5.2
+          - rails6.0
+          - rails6.1
+          - rails7.0
+        exclude:
+          - {ruby-version: '2.6', gemfile: rails7.0}
+          - {ruby-version: '3.0', gemfile: rails5.0}
+          - {ruby-version: '3.0', gemfile: rails5.1}
+          - {ruby-version: '3.0', gemfile: rails5.2}
+          - {ruby-version: '3.0', gemfile: rails6.0}
+          - {ruby-version: '3.1', gemfile: rails5.0}
+          - {ruby-version: '3.1', gemfile: rails5.1}
+          - {ruby-version: '3.1', gemfile: rails5.2}
+          - {ruby-version: '3.1', gemfile: rails6.0}
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: zendesk/checkout@v2
+      - name: Set up Ruby
+        uses: zendesk/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: RSpec
+        run: bundle exec rspec
+
+  specs_successful:
+    name: Specs passing?
+    needs: specs
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          if ${{ needs.specs.result == 'success' }}
+          then
+            echo "All specs pass"
+          else
+            echo "Some specs failed"
+            false
+          fi

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-*[Gg]emfile.lock
+/Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ###### Unreleased
 
+###### v1.5.0
+
+* Add support for Rails 7.0
+* Add support for Ruby 2.7, 3.0, & 3.1
+* Drop support for Ruby 2.4 & 2.5
+* Drop support for Rails 4.2
+
+###### v1.4.3
+
+* Drop support for Ruby 2.2 and 2.3.
+* Drop support for Rails 4.1.
+* Test against Rails 6.0 and 6.1.
+
 ###### v1.4.2
 
 * Test against Rails 5.2 final.

data/README.md

@@ -2,7 +2,7 @@
 
 Allows restoring your Active Records from the dead!
 
-[![Build Status](https://travis-ci.org/zendesk/zombie_record.svg?branch=master)](https://travis-ci.org/zendesk/zombie_record)
+[![Build Status](https://github.com/zendesk/zombie_record/workflows/CI/badge.svg)](https://github.com/zendesk/zombie_record/actions?query=workflow%3ACI)
 
 ## Installation
 

data/Rakefile

@@ -1,8 +1,2 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "wwtd/tasks"
 require "bump/tasks"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => "wwtd:local"

data/gemfiles/rails5.0.gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec path: "../"
 
 gem "activerecord", "~> 5.0.0"
+gem 'sqlite3', '~> 1.3.6'

data/gemfiles/rails5.1.gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec path: "../"
 
 gem "activerecord", "~> 5.1.0"
+gem "sqlite3", "~> 1.3", ">= 1.3.6"

data/gemfiles/rails5.2.gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec path: "../"
 
 gem "activerecord", "~> 5.2.0"
+gem "sqlite3", "~> 1.3", ">= 1.3.6"

data/gemfiles/rails6.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+
+gem "activerecord", "~> 6.0.0"
+gem "sqlite3", "~> 1.4"

data/gemfiles/rails6.1.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+
+gem "activerecord", "~> 6.1.0"
+gem "sqlite3", "~> 1.4"

data/gemfiles/rails7.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+
+gem "activerecord", "~> 7.0.0"
+gem "sqlite3", "~> 1.4"

data/lib/zombie_record/restorable.rb

@@ -96,12 +96,6 @@ module ZombieRecord
         delegate_to_record(name) { @record.public_send(name, *args, &block) }
       end
 
-      if ::RUBY_VERSION.start_with?('2.3.')
-        def respond_to_missing?(method, include_all = false)
-          @record.respond_to?(method, include_all)
-        end
-      end
-
       # We want *all* methods to be delegated.
       BasicObject.instance_methods.each do |name|
         define_method(name) do |*args, &block|
@@ -154,14 +148,8 @@ module ZombieRecord
     end
 
     module WithDeletedAssociationsWrapper
-      if ActiveRecord::VERSION::MAJOR < 5
-        def to_a
-          super.map(&:with_deleted_associations)
-        end
-      else
-        def records
-          super.map(&:with_deleted_associations)
-        end
+      def records
+        super.map(&:with_deleted_associations)
       end
     end
 
@@ -178,15 +166,9 @@ module ZombieRecord
       #
       # Returns an ActiveRecord::Relation.
       def with_deleted
-        if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0
-          all.
-            tap {|relation| relation.default_scoped = false }.
-            extending(WithDeletedAssociationsWrapper)
-        else
-          all.
-            unscope(where: :deleted_at).
-            extending(WithDeletedAssociationsWrapper)
-        end
+        all.
+          unscope(where: :deleted_at).
+          extending(WithDeletedAssociationsWrapper)
       end
     end
   end

data/lib/zombie_record/version.rb

@@ -1,3 +1,3 @@
 module ZombieRecord
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

data/spec/spec_helper.rb

@@ -70,19 +70,11 @@ RSpec.configure do |config|
   end
 
   config.before :suite do
-    mysql = URI(ENV['MYSQL_URL'] || 'mysql://root@127.0.0.1:3306')
-
     ActiveRecord::Base.establish_connection(
-      adapter: "mysql2",
-      username: mysql.user,
-      host: mysql.host,
-      port: mysql.port,
-      password: mysql.password
+      adapter: "sqlite3",
+      database: ":memory:"
     )
 
-    ActiveRecord::Base.connection.create_database("zombie_record")
-    ActiveRecord::Base.connection.execute("use zombie_record;")
-
     ActiveRecord::Schema.define do
       self.verbose = false
 

data/zombie_record.gemspec

@@ -15,14 +15,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.1", "< 6.0"
-  spec.add_dependency "mysql2"
+  spec.required_ruby_version = ">= 2.6"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_dependency "activerecord", ">= 5.0", "< 7.1"
+
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bump"
-  spec.add_development_dependency "rspec", "~> 3.5.0"
+  spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "timecop"
-  spec.add_development_dependency "wwtd"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zombie_record
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Daniel Schierbeck
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,48 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -106,16 +92,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,19 +135,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.2.gemfile
 - gemfiles/rails5.0.gemfile
 - gemfiles/rails5.1.gemfile
 - gemfiles/rails5.2.gemfile
+- gemfiles/rails6.0.gemfile
+- gemfiles/rails6.1.gemfile
+- gemfiles/rails7.0.gemfile
 - lib/zombie_record.rb
 - lib/zombie_record/restorable.rb
 - lib/zombie_record/version.rb
@@ -172,7 +159,7 @@ homepage: https://github.com/zendesk/zombie_record
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,16 +167,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Allows restoring your Active Records from the dead!
 test_files:

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-gemfile:
-  - gemfiles/rails4.1.gemfile
-  - gemfiles/rails4.2.gemfile
-  - gemfiles/rails5.0.gemfile
-  - gemfiles/rails5.1.gemfile
-  - gemfiles/rails5.2.gemfile
-bundler_args: ""
-script: "bundle exec rake spec"
-matrix:
-  exclude:
-    - rvm: 2.4
-      gemfile: gemfiles/rails4.1.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/rails4.1.gemfile

data/gemfiles/rails4.1.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: "../"
-
-gem "activerecord", "~> 4.1.8"
-gem "mysql2", "~> 0.3.0"

data/gemfiles/rails4.2.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: "../"
-
-gem "activerecord", "~> 4.2.0"
-gem "mysql2", "~> 0.4.0"